Fixed some warnings by commenting out unused code and removing test code