Removed old checkpoint/restart mechanism