Remove unnecessary variable assigns