General Cleanup for preview