Removed redundant variables