Proper deletion. (Actual solution to #3)