Clean(er) map code with silly comma fix

Deleted large sections which did not map appropriate data