WIP: Major cleaning to improve mercury verbs layer