(RGL) More cleanups pt. 6