cleaned up dependencies a bit