QFix remove redundant code