cleaned up unneeded code from map