moar better delete handling