Got rid of ActivityModels.cs