Cleanup of generic types (using parameterised types)