Removing references to useless world