Removed unnecessary generics and methods