cleaning up entities