Production PCB refactor