Parser: remove unnecessary code