Removed map hacks