remove popup.
Fix media creation.