Updated dependencies
Cleanup