removed some mutexes