Minor clean up for unused code and whitespace-related code warnings