Remove old definition API that was deprecated
Small code cleanups.
Merge pull request #108 from wvanbergen/cleanup

Code cleanup