Even even more range cleanup