one last removal of non type inference code