Removes more old code that prevents compilation.
Merge branch 'api-cleanup' of github.com:code-iai/asimov into api-cleanup