cleaned up some output, removed dead code.