Preview functionality cleanup