Q6 removed more useless code