Remove duplicate locking mechanisms