updated dependencies and clean-up