Option to disable CleanData function