Merge "Clean up obsolete rc files"