Cleanup pcb

Some changes that didn't make it thru git yet