Code cleanup to fix Multi-Window