Fixed the export, unexport, and cleanup methods.