Adds removal of system vars