Removed Main clutter / Criterion dependency