mod. add method _remove_lock.

Change-Id: I09e78b5373e8ee68bb366ea05858e28673fb5a1f