Removed unused loop which may have caused concurrent issues