cleanups of generics etc