Remove Q and domain requirements