Unexport and cleanup