Remove old mark code. update deps