Removed unneeded import
Solved Java generics issues