Cleans up some old test code and comments.