s4 map and GUI cleanup