More cleanup but appears inconsistent as to whether qactions need to account for check argument although that doesn't make sense