cleanup of server, removing prints and removed functions