Did some clean up on buildfwt