Remove Q, fix copy-to-gaia