(RGL) More cleanups, pt. 7