Remove unused definition and clean up exports.