#71 Removed expression parser