remove dependency on Q
remove dependency on Q