Some more housecleaning after build is done