Remove unnecessary variable.
Major update