Cleaning up some old comments and code.