Clean up package "entities"