Dependencies cleanup and update