E1S4: minor map cleanup