restting the optimistic locking option back to optional in clenup