diff --git a/internal/entityfiles/entityfiles.go b/internal/entityfiles/entityfiles.go
index 36596c8..ae96823 100644
--- a/internal/entityfiles/entityfiles.go
+++ b/internal/entityfiles/entityfiles.go
@@ -150,6 +150,8 @@ func loadEntityFileYaml(filename string, entityname string) {
 func updateEvmFromFile(entityname string, data []map[string]string) {
 	count := len(data)
 
+	sv.RemoveKeysThatStartWith("entities." + entityname)
+
 	sv.Contents["entities."+entityname+".count"] = fmt.Sprintf("%v", count)
 
 	for i, mapp := range data {
diff --git a/internal/stringvariables/entities.go b/internal/stringvariables/entities.go
index f1edcc0..15502b3 100644
--- a/internal/stringvariables/entities.go
+++ b/internal/stringvariables/entities.go
@@ -27,3 +27,11 @@ func ReplaceEntityVars(prefix string, source string) string {
 
 	return source
 }
+
+func RemoveKeysThatStartWith(search string) {
+	for k, _ := range Contents {
+		if strings.HasPrefix(k, search) {
+			delete(Contents, k)
+		}
+	}
+}