Remove more locks