meta-data cleanup