3.0 cleanup

remove unneeded use calls