last of the cpplint clean-up