Cleaning because of the new parser