Cleanup and remove warnings for server