Added some redundancy for removing the lock.