psm: remove outdated use of HAVE_PSM
verbs: remove outdated use of HAVE_VERBS