cleanup labels from modals and import-export cleanup

Cleanup labels from modals and import-export cleanup