Continuation of erebus.world.feature cleaning up