Using `clear' to clean up lists instead of clean via integration

src/collections.cc

@@ -38,10 +38,10 @@ Collections::Collections() {
 
 
 Collections::~Collections() {
-    for (auto &a : *this) {
-        this->erase(a.first);
-        delete a.second;
+    for (const auto &thing : *this) {
+        delete thing.second;
     }
+    this->clear();
 }
 
 

src/variables.cc

@@ -35,9 +35,7 @@ Variables::Variables() {
 }
 
 Variables::~Variables() {
-    for (auto &a : *this) {
-        this->erase(a.first);
-    }
+    this->clear();
 }
 
 void Variables::store(std::string key, std::string value) {