Remove unnecessary variable setting