Update deps & cleanup