(RGL) Cleanups - cut down on feature set