small clean-up and fix removing aqueducts