More meta-data cleanup