add proper tear-down capabilities