Merge "Use more efficient clean specs." into jb-mr1-dev