Fix: Memory leak

Added additional cleanup to the destroy hook