get rid of dep regex; cleanup replicate more