Closes #26 - Safe delete refactoring.