(RGL) Cleanups pt. 2