Comment out certain cleanup functions for -DQDISC