Clean up generics leftover