Removed return snip and updated qc.

qc snippe was far too complicated and caused some workflow problems.