Fix
QM - Delete unneccesary codes