Remove keyval comments