Cleaned up Rules. Removed old cruft.