Fixed a and commented out a bunch of unused code that was making the static analyzer complain.