Fixed warning about raw generics
Removed unused method
Suppressed unused warnings
Fixed unused warnings