Cleanup, removed deprecated APIs
1.18.0