remove more intermediate files
Merge commit 'f2357c7' into linux-build