Cleared entity removal process and moved some strange responsibilities away from entity manager, which should be obsoletele soon enough.