big cleanup for PreviewDrawer