Cleaning up packages, removing RemoteEntities for now until more testing can be done