Remove old unused declarations