Fixed delete method + cleanup