Cleaning up dependencies, updating to latest