diff --git a/src/gsc/context.cpp b/src/gsc/context.cpp
index 80581118..664915dc 100644
--- a/src/gsc/context.cpp
+++ b/src/gsc/context.cpp
@@ -33,11 +33,6 @@ auto context::init(gsc::build build, fs_callback callback) -> void
 
 auto context::cleanup() -> void
 {
-    source_ = gsc::source{ this };
-    assembler_ = gsc::assembler{ this };
-    disassembler_ = gsc::disassembler{ this };
-    compiler_ = gsc::compiler{ this };
-    decompiler_ = gsc::decompiler{ this };
     header_files_.clear();
     include_cache_.clear();
     includes_.clear();
diff --git a/src/gsc/source.cpp b/src/gsc/source.cpp
index d0f33aed..72fe01e6 100644
--- a/src/gsc/source.cpp
+++ b/src/gsc/source.cpp
@@ -162,7 +162,7 @@ auto source::dump(assembly const& data) -> std::vector<u8>
 
     dump_assembly(data);
 
-    return buf_;
+    return std::move(buf_);
 }
 
 auto source::dump(program const& data) -> std::vector<u8>
@@ -175,7 +175,7 @@ auto source::dump(program const& data) -> std::vector<u8>
     
     dump_program(data);
 
-    return buf_;
+    return std::move(buf_);
 }
 
 auto source::dump_assembly(assembly const& data) -> void