Removed excess utility code from Map.java