remove Q dependency