Lint cleanup work.