more cleanup on the 2.1 board