MODE-2323 Cleaned up previous commit, removed unused classes, enabled use of OPTIMISTIC or PESSIMISTIC locking