Began cleaning the MapParser