Remove redundant traces from old shift-register lines
Minor fixes