remove debugging code that shouldn't go in other trees.
Comment: currently ignoring city limits, which appears to work, though.