Remove unnecessary generic types