Remove use of `Parser`