removed some dependencies, fixed a q issue