Cleanup to simpler mode