Fix warnings related to removal of all unused local variables - added
annotations or commented out code depending on how they were being used.