changed parser: unnessesary methods deleted