Remove generics