Removed legacy variables