Updated deps
Cleaning up