deletion weirdness

@skddc I think this fixes all the deletion bugs that we experienced yesterday.

Maybe we can release 0.7.2 today after all :)