#42: RC! cleanup