Cleaning up before doing anything in the build

Change-Id: Icf36fc1e5f26c36d004056ff6ef4339a28dde824