Cleaned up dependencies, kept only what we need