Better way of reading maps
Removed some debug code that is no longer required