more model cleanup