Update deps + small cleanup