rc: clean-up