Verbs complete. Lots of cleanup