Removed most QSTools Violations