OPAL-1929: Fixing some warnings and removed commented out class