Removing more use of current flag