Added missing undeclared dependencies and removed some unused ones