Remove some unnecessary variables