WIP: update & clean deps