Code changes to remove use of the lock file.
Missed some minor updates to the TODO list