Control board code cleanup