Remove the old 200-line parser in favor of new one