Remove Unused Imports, Variables, Private Methods, Etc.

This cleans up the code and brings the warning count in eclipse down to 609