cleaned up more unecessary type parameterization in various functions