more model cleanup and testing