Remove excessive use of NOTE's.