[Build] Tidy up