Removed deprecated variables