relocated the QC flags
removed useless code
Merge pull request #401 from Galithil/master

relocated the QC flags