Cleanup deprecated api
Merge pull request #98 from ctomc/managmenet

Cleanup deprecated api