Cleanup - removing old rng2 code