Remove old unused defines