Updating parser in order to remove unecessary comment field