Got rid of generics.