Removed some redundant vars that have gone to support