Cleaned out excess metadata and models for now