more cleanups of rnage code