Clean up wotapi functions
Merge branch 'master' into exnom