Entity clean up