removed all generics from models