Removing rest of dependencies