(RGL) More cleanups pt. 5