removed junk code from map1