Refactor - remove Parser