Dependencies update, clean up