Remove q; mapping