Removed useless rules, added support for do() syntax