Reduce cleansteps, not needed for every build

Change-Id: Ic47e5aeefd3e5a0d9d59c9cec5d8289aab503e56