Remove lock (18/32)

Remove lock