code update - steve

removed some testing code and removed previously commented out code