cleaned up the dependencies a bit