Cleaning some noise from debugging, and removed some old unused methods