Clean-up on track for old city hall