Parser target refactor to remove UGLY TargetClass class