Clean up some crufty/debug stuff that should never have been committed...