Removing unneeded generics
More Generic Cleanup