Update server-functions-plugin and cleanup server functions (#2005)

Update server-functions-plugin and cleanup server functions (#2005) #929