minor cleanups for RMF update