[Build] Some build file tidy up