[ci skip] Cleaning up the buildscript