Cleanup and update of dependencies