removed some unnecessary generic declarations.