WIP removing old vars.