Refactor: remove expression parsing
Refactor: remove expression parsing