removed some of the "dependencies"