GH-1 Code cleanup - removed a whole lot of Eclipse warnings