Artifacts of Support and utility classes #1333