am f31d0500: Simplify destructors

* commit 'f31d05007c9cc5db90e0641e4f8621f5463dcb4e':
  Simplify destructors