Remove paper trail from everything but Users and re-add optimistic locking