Eradicate use of range