Remove really unused variables