Remove unnecessary variables