Reintroduce export link, cleanup.