remove old unit test code, and clean up whitespace