clean up of type parameters