Remove trails related api
Merge branch 'master' into calendar