cleaning up some debugging code and commented, unused code.