Clean up export definitions