cleanup labels from modals and import-export cleanup