Remove unused (for now) references