HLint cleanup