updated and removed some dependencies