correct map, removed commented code