Removing unnecessary variable set