Deletion API
Merge branch 'old_api'