Clean up entities