moving to standalone
cleanup of server stuff