Dependencies update and removal of those that seems to be not really of use