Added data cleanup code