Remove tap and vows