Removed unneeded loop/counters from un manager