Cleanup Map Code