Cleaning up dependencies and packages (make it build on clean machine!)