OrganismLayer cleanup