Remove commented code for the old map