removed redundant vars