Remove unnecessary variables/lines