Cleanup of old functions
Merge branch 'master' of https://github.com/kristjanmik/apis