Reviewed code, added some TODOs

Useless (because not referenced elsewhere) class Map has been removed