Clean up some board code