Update deps and remove redundant code.