World|Map: Cleanup