Remove Q from API. ref #302 ref #255