Clean up entity generator