Updated dependencies and cleaning up