Remove old debugging, and some new stuff