Remove obosolete variables