Cleanup; Deps fixes