Change #133: remove World Anchor and clean-up