api: better removal API