mason.git: cleanup
mason.git: cleanup

mcandre/factor,erg/factor,mcandre/factor,erg/factor,mcandre/factor,mcandre/factor,mcandre/factor,erg/factor,mcandre/factor,erg/factor,erg/factor,erg/factor,mcandre/factor,erg/factor