Added Nallar's world cleanup patch for dimension manager