Further improvements to cleanliness and completeness scripts