Removed redundant variable set