simplify {add,remove}Rule

git grep '(add|remove)Rule' | cut -d: -f1-2 | while read i; do mcedit $i; done

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6bdbe823338d1198e17bf8c4bf27ebd0df5d49c1