Switch verbd to new api
verbs updated to new api
remove obsolete verb apis