More removal of dependencies