Remove deprecated api calls

Close #35