Fix deletion issues

closes #4061