remove dummy code from Parser
       add Type to prepare for next refactory