Code cleanup
Vocation code cleanup
WildcardTree cleanup