Cleanup to narrow down the issue