initial data cleanup