split delete method up

fixes #10