Track api changes and remove some unused code
Merge pull request #440 from slluis/track-api-changes

Track api changes and remove some unused code