Fix export issue and remove unnecessary toast messages