restored removal of q.