Remove old variable names