Cleaned up entities