Remove unused dependencies, simplify run