switched out most old mutex references