diff --git a/package.json b/package.json
index e854112..3b90b5e 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   "devDependencies": {
     "@types/lodash": "^4.14.85",
     "rollup": "^0.51.8",
+    "rollup-plugin-clean": "^1.0.0",
     "rollup-plugin-commonjs": "^8.2.6",
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-screeps-upload": "git+https://github.com/ezolenko/rollup-plugin-screeps-upload.git#master",
diff --git a/rollup.config.js b/rollup.config.js
index 9c1a32f..0d649bd 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -2,13 +2,12 @@
 
 import fs from "fs";
 import path from "path";
+import clean from "rollup-plugin-clean";
 import resolve from "rollup-plugin-node-resolve";
 import commonjs from "rollup-plugin-commonjs";
 import screepsUpload from "rollup-plugin-screeps-upload";
 import typescript from "rollup-plugin-typescript2";
 
-const getSourcemapFilename = () => "main.js.map.js";
-
 // In Screeps, require only works for exported content
 // This "plugin" prepends an export to source maps so that it can be loaded in screeps via require`
 function exportSourceMaps(options) {
@@ -23,11 +22,12 @@ function exportSourceMaps(options) {
         return "module.exports = " + tmp.apply(this, arguments) + ";";
       }
     },
-    onwrite: function ({ bundle }) {
-      const map = bundle.map
-      fs.writeFileSync(path.resolve(__dirname, `./dist/${options || getSourcemapFilename()}`), map);
-      // Delete the old file
-      fs.unlinkSync(path.resolve(__dirname, "./dist/main.js.map"));
+    onwrite: function () {
+      // Rename generated source file
+      fs.renameSync(
+        path.resolve(__dirname, "./dist", "main.js.map"),
+        path.resolve(__dirname, "./dist", options.filename || "main.js.map.js")
+      );
     }
   }
 }
@@ -42,10 +42,11 @@ export default {
   sourcemap: true,
 
   plugins: [
+    clean(),
     resolve(),
     commonjs(),
     typescript({tsconfig: "./tsconfig.json"}),
-    exportSourceMaps("main.js.map.js"),
+    exportSourceMaps({filename: "./main.js.map.js"}),
     screepsUpload("./screeps.json")
   ]
 }