diff --git a/flaim/src/fdbcopy.cpp b/flaim/src/fdbcopy.cpp
index 6023b74..e835206 100644
--- a/flaim/src/fdbcopy.cpp
+++ b/flaim/src/fdbcopy.cpp
@@ -273,7 +273,7 @@ FSTATIC RCODE flmCopyDb(
 		{
 			pFileLockObj = pFile->pFileLockObj;
 			pFileLockObj->AddRef();
-			if (RC_BAD( rc = pFileLockObj->Lock( TRUE, NULL, FALSE, TRUE, 15, 0)))
+			if (RC_BAD( rc = pFileLockObj->Lock( TRUE, NULL, FALSE, TRUE, FLM_NO_TIMEOUT, 0)))
 			{
 				goto Exit;
 			}
diff --git a/flaim/src/flaimsys.h b/flaim/src/flaimsys.h
index 967729c..de57b18 100644
--- a/flaim/src/flaimsys.h
+++ b/flaim/src/flaimsys.h
@@ -2200,7 +2200,6 @@ typedef struct DB_INFO
 	FLMBOOL						bDbInitialized;
 	F_SuperFileHdl *			pSFileHdl;
 	FLMUINT						uiFlags;
-	FLMUINT						uiMaxLockWait;
 	FLMBOOL						bStartedUpdateTrans;
 } DB_INFO;
 
diff --git a/flaim/src/flchkdb.cpp b/flaim/src/flchkdb.cpp
index 8eade77..d35d2ca 100644
--- a/flaim/src/flchkdb.cpp
+++ b/flaim/src/flchkdb.cpp
@@ -501,7 +501,6 @@ Begin_Check:
 	pDbInfo->pLogicalFiles = NULL;
 	pDbInfo->pProgress->pLfStats = NULL;
 	pDbInfo->uiFlags = uiCheckFlags;
-	pDbInfo->uiMaxLockWait = 15;
 	pDbInfo->bStartedUpdateTrans = FALSE;
 	f_memset( &pDbInfo->pProgress->AvailBlocks, 0, sizeof(BLOCK_INFO));
 	f_memset( &pDbInfo->pProgress->LFHBlocks, 0, sizeof(BLOCK_INFO));
@@ -2520,7 +2519,7 @@ FSTATIC RCODE chkStartUpdate(
 		// Try to start an update transaction
 
 		if (RC_BAD( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS,
-					  pIxChkInfo->pDbInfo->uiMaxLockWait, FLM_DONT_POISON_CACHE)))
+					  FLM_NO_TIMEOUT, FLM_DONT_POISON_CACHE)))
 		{
 			goto Exit;
 		}
diff --git a/flaim/src/flconvrt.cpp b/flaim/src/flconvrt.cpp
index e130ca0..f709c0d 100644
--- a/flaim/src/flconvrt.cpp
+++ b/flaim/src/flconvrt.cpp
@@ -67,7 +67,7 @@ FLMEXP RCODE FLMAPI FlmDbUpgrade(
 
 	if( (pDb->uiFlags & FDB_HAS_FILE_LOCK) == 0)
 	{
-		if( RC_BAD( rc = FlmDbLock( hDb, FLM_LOCK_EXCLUSIVE, 0, 15)))
+		if( RC_BAD( rc = FlmDbLock( hDb, FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT)))
 		{
 			goto Exit;
 		}
@@ -713,7 +713,7 @@ FLMEXP RCODE FLMAPI FlmDbWrapKey(
 
 	if( (pDb->uiFlags & FDB_HAS_FILE_LOCK) == 0)
 	{
-		if( RC_BAD( rc = FlmDbLock( hDb, FLM_LOCK_EXCLUSIVE, 0, 15)))
+		if( RC_BAD( rc = FlmDbLock( hDb, FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT)))
 		{
 			goto Exit;
 		}
diff --git a/flaim/src/flcreate.cpp b/flaim/src/flcreate.cpp
index ddad5e1..2c03155 100644
--- a/flaim/src/flcreate.cpp
+++ b/flaim/src/flcreate.cpp
@@ -425,7 +425,7 @@ FSTATIC RCODE flmInitNewFile(
 	// The following code starts an update transaction on the new DB so
 	// we can get it built.
 
-	if (RC_BAD( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, 0)))
+	if (RC_BAD( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, FLM_NO_TIMEOUT)))
 	{
 		goto Exit;
 	}
diff --git a/flaim/src/flreduce.cpp b/flaim/src/flreduce.cpp
index c4a0f80..ae59b68 100644
--- a/flaim/src/flreduce.cpp
+++ b/flaim/src/flreduce.cpp
@@ -86,7 +86,7 @@ FLMEXP RCODE FLMAPI FlmDbReduceSize(
 
 	if( (pDb->uiFlags & FDB_HAS_FILE_LOCK) == 0)
 	{
-		if( RC_BAD( rc = FlmDbLock( hDb, FLM_LOCK_EXCLUSIVE, 0, 15)))
+		if( RC_BAD( rc = FlmDbLock( hDb, FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT)))
 		{
 			goto Exit;
 		}
@@ -166,7 +166,7 @@ Transmission_Error:
 	// Start a database transaction
 
 	if (RC_BAD(rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, 
-		15, FLM_DONT_POISON_CACHE)))
+		FLM_NO_TIMEOUT, FLM_DONT_POISON_CACHE)))
 	{
 		goto Exit;
 	}
diff --git a/flaim/src/flsweep.cpp b/flaim/src/flsweep.cpp
index 6d23b90..85121d9 100644
--- a/flaim/src/flsweep.cpp
+++ b/flaim/src/flsweep.cpp
@@ -24,8 +24,6 @@
 
 #include "flaimsys.h"
 
-#define SWEEPER_LOCK_WAIT			60
-
 /****************************************************************************
 Desc:
 ****************************************************************************/
@@ -923,7 +921,7 @@ RCODE DbDict::Finish()				// Finish will make any final changes to the
 			/* Delete the 'purged' item */
 
 			if( RC_BAD( rc = FlmRecordDelete( (HFDB)m_pDb, FLM_DICT_CONTAINER, 
-				uiItem, SWEEPER_LOCK_WAIT | FLM_AUTO_TRANS)))
+				uiItem, FLM_NO_TIMEOUT | FLM_AUTO_TRANS)))
 			{
 				goto Exit;
 			}
@@ -963,7 +961,7 @@ RCODE flmChangeItemState(
 	if( pDb->uiTransType == FLM_NO_TRANS)
 	{
 		if( RC_BAD( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, 
-			SWEEPER_LOCK_WAIT, FLM_DONT_POISON_CACHE)))
+			FLM_NO_TIMEOUT, FLM_DONT_POISON_CACHE)))
 		{
 			goto Exit;
 		}
diff --git a/flaim/src/frebuild.cpp b/flaim/src/frebuild.cpp
index 81aa1e7..9041640 100644
--- a/flaim/src/frebuild.cpp
+++ b/flaim/src/frebuild.cpp
@@ -1927,7 +1927,7 @@ Do_Dict_Recs:
 			{
 				// Start an update transaction
 
-				if( RC_BAD( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, 5)))
+				if( RC_BAD( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, FLM_NO_TIMEOUT)))
 				{
 					goto Exit;
 				}
@@ -2061,7 +2061,7 @@ Exit:
 	bldFreeRecovDictInfo( pDictToDo);
 	if ((RC_OK( rc)) && (!(*pbStartedTransRV)))
 	{
-		if (RC_OK( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, 5)))
+		if (RC_OK( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, FLM_NO_TIMEOUT)))
 		{
 			*pbStartedTransRV = TRUE;
 		}
diff --git a/flaim/src/rfl.cpp b/flaim/src/rfl.cpp
index 886daec..9a4a2bc 100644
--- a/flaim/src/rfl.cpp
+++ b/flaim/src/rfl.cpp
@@ -6837,7 +6837,7 @@ RCODE F_Rfl::readOp(
 				// to know whether or not a password is needed to open the
 				// database.
 
-				if (RC_BAD( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, 0, 0)))
+				if (RC_BAD( rc = flmBeginDbTrans( pDb, FLM_UPDATE_TRANS, FLM_NO_TIMEOUT, 0)))
 				{
 					goto Exit;
 				}