More R# cleanups