qed: Additional work toward cleaning C=1