Massive cleanup of generics