Removed and moved loading map code.