Remove generics, they were just hurting