Clean + Update to remove legacy variables