Resolve todo
Use deregister from objectMap