Cleanup some todos and logging in exports.