[DEV] Better API for deletion / destruction (untested)