Implemented a system to cleanup unbound entities