(RGL) Cleanups