Cleaned up preview windows after we've tested their content.
Merge pull request #2736 from refinery/preview-functionality-cleanup

Preview functionality cleanup