Build: More cleanup

Change-Id: Ifdea0aa6c9e427fc1b5a66fdb8f07b5db4193d4b