remove mutex's

Change-Id: I1280b33bb87511d9d29345cfec56b9c94d2e26b0
cleanup remains of mutex

Change-Id: I226c92d6f726febe09f85faf11b198d877d8bcbb