ENH: Removed other locking mechanisms