Clean up after switch to BS3 design.