Remove dependency on Q