RR: Some clean-ups