remove more type parameters to make this easier to replace legacy code