cleanup of export lists
WIP