Core/Creature: cleanup