remove old debugging constructs