cleanup before refactoring .. mostly generics-related