Commented out mapping stuff

I've only commented that out because mapping might come back in the future. I haven't even removed all the relevant fragments/activities yet, I'll wait for Al's feedback.