rm q2 as methods are moved to q