Quick import cleanup

Two map classes making AIR all angry