Merge pull request #713 from microsoft/remove-rules