code review fixes; remove extra admin call