HOPKINS: Remove dead code in ObjectsManager, some renaming