Cleanup deprecated api