Clean up after ourselves when building base boxes