Remove old schematic, move clock logic