cleanup

Will I ever remember to take out all the painful debug lines?  Nope.