Remove lock (16/32)

Remove lock