Dead letter queue isn't cleaned up

@RobBavey, is your answer in Questions about dead letter queue still valid?