(RGL) More cleanups