More code cleanup and removing old generics stuff.