cleaning up old cqt ugliness