Removed redundant vars