update parser

delete methods and refactoring