diff --git a/src/ext/lib/comms/CommsPopupClient.ts b/src/ext/lib/comms/CommsPopupClient.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/popup/panels/DefaultSettingsPanel.vue b/src/popup/panels/DefaultSettingsPanel.vue
deleted file mode 100644
index f2e5c11..0000000
--- a/src/popup/panels/DefaultSettingsPanel.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <div class="flex flex-column" style="padding-bottom: 20px">
-    <!-- <ShortcutButton class="button" 
-                    @click.native="wipeSettings()"
-                    label="Wipe settings"
-    />  -->
-    
-      <!-- ENABLE EXTENSION -->
-    <div v-if="settings && extensionActions.length"
-          class="w100"
-    >
-    <div class="label">Enable extension <template v-if="scope === 'site'">for {{site}}</template>:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of extensionActions"
-                        class="flex flex-grow button"
-                        :key="index"
-                        :class="{'setting-selected': getCurrent('mode') === action.cmd[0].arg }"
-                        :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-        >
-        </ShortcutButton>
-      </div>
-    </div>
-
-    <!-- ENABLE AUTODETECTION -->
-    <div v-if="aardActions.length"
-         class="w100"
-    >
-      <div class="label">Enable autodetection <template v-if="scope === 'site'">for {{site}}</template>:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of aardActions"
-                        class="flex flex-grow button"
-                        :class="{'setting-selected': getCurrent('autoar') === action.cmd[0].arg}"
-                        :key="index"
-                        :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-        >
-        </ShortcutButton>
-      <div class="info"><small>Note: some sites implement restrictions that make autodetection a fair bit less reliable in Firefox and outright impossible in anything else.</small></div>
-      </div>
-    </div>
-
-    <!-- CROP MODE PERSISTENCE -->
-    <div v-if="cropModePersistenceActions.length"
-         class="w100"
-    >
-      <div class="label">Persists crop mode <template v-if="scope === 'site'">for {{site}}</template>:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of cropModePersistenceActions"
-                        class="flex flex-grow button b3"
-                        :class="{'setting-selected': getCurrent('cropModePersistence') === action.cmd[0].arg}"
-                        :key="index"
-                        :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-        >
-        </ShortcutButton>
-      </div>
-    </div>
-
-    <!-- DEFAULT SETTINGS -->
-    <div v-if="stretchActions.length">
-      <div class="label experimental">Default stretching mode:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of stretchActions"
-                        class="flex b3 flex-grow button"
-                        :class="{'setting-selected': getCurrent('stretch') === action.cmd[0].arg}"
-                        :key="index"
-                        :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-        >
-        </ShortcutButton>
-      </div>
-    </div>
-
-    <div v-if="keyboardActions.length">
-      <div class="label experimental">Enable/disable keyboard shortcuts</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of keyboardActions"
-                        class="flex b3 flex-grow button"
-                        :class="{'setting-selected': getCurrent('keyboardShortcutsEnabled') === action.cmd[0].arg}"
-                        :key="index"
-                        :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-                        >
-        </ShortcutButton>
-      </div>
-    </div>
-
-    <div v-if="alignmentActions.length">
-      <div class="label">Video alignment:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of alignmentActions"
-                        class="flex b3 flex-grow button"
-                        :class="{'setting-selected': getCurrent('videoAlignment') === action.cmd[0].arg}"
-                        :key="index"
-                        :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-                        >
-        </ShortcutButton>
-      </div>
-    </div>
-
-    <div v-if="otherActions.length">
-      <div class="label">Other actions:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of otherActions"
-                        class="flex b3 flex-grow button"
-                        :key="index"
-                        :label="(action.scopes[scope] && action.scopes[scope].label) ? action.scopes[scope].label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-                        >
-        </ShortcutButton>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import ExecAction from '../js/ExecAction';
-import KeyboardShortcutParser from '../../common/js/KeyboardShortcutParser';
-import ShortcutButton from '../../common/components/ShortcutButton';
-import ComputeActionsMixin from '../../common/mixins/ComputeActionsMixin';
-
-export default {
-  data() {
-    return {
-    }
-  },
-  mixins: [
-    ComputeActionsMixin
-  ],
-  props: {
-    settings: Object,
-    scope: String,
-    site: String,
-  },
-  created() {
-    this.exec = new ExecAction(this.settings, this.site);
-  },
-  components: {
-    ShortcutButton,
-  },
-  watch: {
-    settings: {
-      deep: true,
-      handler: function(val) {
-        this.$forceUpdate();
-        this.exec.setSettings(val);
-      }
-    },
-    site: function(val){
-      this.exec.setSite(val);
-    }
-  },
-  methods: {
-    execAction(action) {
-      this.exec.exec(action, this.scope);
-    },
-    getCurrent(option) {
-      if (!this.settings) {
-        return undefined;
-      }
-
-      let site;
-      if (this.scope === 'global') {
-        site = '@global'
-      } else {
-        if (!this.site) {
-          return '';
-        }
-        site = this.site;
-      }
-      if (this.settings.active.sites[site]) {
-        return this.settings.active.sites[site][option];
-      } else {
-        return this.settings.getDefaultOption(option);
-      }
-    },
-    parseShortcut(action) {
-      if (! action.scopes[this.scope].shortcut) {
-        return '';
-      }
-      return KeyboardShortcutParser.parseShortcut(action.scopes[this.scope].shortcut[0]);
-    },
-    wipeSettings() {
-      settings.setDefaultSettings();
-    }
-  }
-}
-</script>
-
-<style>
-</style>
diff --git a/src/popup/panels/DonatePanel.vue b/src/popup/panels/DonatePanel.vue
deleted file mode 100644
index f8afe6a..0000000
--- a/src/popup/panels/DonatePanel.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <div>
-    TODO: beggathon
-  </div>
-</template>
diff --git a/src/popup/panels/PerformancePanel.vue b/src/popup/panels/PerformancePanel.vue
deleted file mode 100644
index f5b9ce3..0000000
--- a/src/popup/panels/PerformancePanel.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <div>
-    PERFORMANCE PANEL :: This is here for debugging purposes.
-
-    <pre>{{performance}}</pre>
-  </div>
-</template>
-
-<script>
-
-
-export default {
-  props: {
-    performance: Object,
-  },
-  watch: {
-    performance: {
-      deep: true,
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/src/popup/panels/VideoPanel.vue b/src/popup/panels/VideoPanel.vue
deleted file mode 100644
index 8d4cea1..0000000
--- a/src/popup/panels/VideoPanel.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<template>
-  <div class="" style="padding-bottom: 20px">
-    <div v-if="someSitesDisabledWarning" class="warning-lite">
-      Some sites embedded on this page are disabled. Extension will not work on videos embedded from disabled sites.
-    </div>
-    <div v-if="aspectRatioActions.length">
-      <div class="label">Cropping mode:</div>
-      <div v-if="cropModePersistence && cropModePersistence > CropModePersistence.Disabled" class="info">
-        Cropping mode will persist
-         <template v-if="cropModePersistence === CropModePersistence.UntilPageReload">until page reload (this includes page navigation!).</template>
-         <template v-if="cropModePersistence === CropModePersistence.CurrentSession">for current session.</template>
-         <template v-if="cropModePersistence === CropModePersistence.Forever">forever (or at least until you change aspect ratio manually).</template>
-        This can be changed in the 'site settings' or 'extension settings' tab.
-      </div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of aspectRatioActions"
-                        class="flex b3 flex-grow button"
-                        :key="index"
-                        :label="(action.scopes.page && action.scopes.page.label) ? action.scopes.page.label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-        >
-        </ShortcutButton>
-      </div>
-      <div><small>You can change or add additional aspect ratios on <a href="#" @click="openOptionsPage()">the settings page</a> (in 'actions&shortcuts' menu).</small></div>
-    </div>
-
-    <div v-if="false"
-         class="">
-      <div class="label experimental">Zooming and panning</div>
-      <div class="row"
-      >
-        <!--
-          min, max and value need to be implemented in js as this slider
-          should use logarithmic scale
-        -->
-        <input id="_input_zoom_slider"
-                class="input-slider"
-                type="range"
-                step="any"
-                min="-1"
-                max="4"
-                :value="logarithmicZoom"
-                @input="changeZoom($event.target.value)"
-                />
-        <div style="overflow: auto" class="flex flex-row">
-          <div class="flex flex-grow medium-small x-pad-1em">
-            Zoom: {{(zoom * 100).toFixed()}}%
-          </div>
-          <div class="flex flex-nogrow flex-noshrink medium-small">
-            <a class="_zoom_reset x-pad-1em" @click="resetZoom()">reset</a>
-          </div>
-        </div>
-
-        <div class="m-t-0-33em display-block">
-          <input id="_input_zoom_site_allow_pan"
-                  type="checkbox"
-                  />
-          Pan with mouse
-        </div>
-      </div>
-    </div>
-
-    <div v-if="stretchActions.length">
-      <div class="label">Stretching mode:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of stretchActions"
-                        class="flex b3 flex-grow button"
-                        :key="index"
-                        :label="(action.scopes.page && action.scopes.page.label) ? action.scopes.page.label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-                        >
-        </ShortcutButton>
-      </div>
-    </div>
-    
-    <!-- <div v-if="keyboardActions.length">
-      <div class="label">Keyboard shortcuts:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of keyboardActions"
-                        class="flex b3 button"
-                        :key="index"
-                        :label="(action.scopes.page && action.scopes.page.label) ? action.scopes.page.label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-                        >
-        </ShortcutButton>
-      </div>
-    </div> -->
-
-    <div v-if="alignmentActions.length">
-      <div class="label">Video alignment:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of alignmentActions"
-                        class="flex b3 button"
-                        :key="index"
-                        :label="(action.scopes.page && action.scopes.page.label) ? action.scopes.page.label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-                        >
-        </ShortcutButton>
-      </div>
-    </div>
-
-    <div v-if="otherActions.length">
-      <div class="label">Other actions:</div>
-      <div class="flex flex-row flex-wrap">
-        <ShortcutButton v-for="(action, index) of otherActions"
-                        class="flex b3 button"
-                        :key="index"
-                        :label="(action.scopes.page && action.scopes.page.label) ? action.scopes.page.label : action.label"
-                        :shortcut="parseShortcut(action)"
-                        @click.native="execAction(action)"
-                        >
-        </ShortcutButton>
-      </div>
-    </div>
-
-  </div>
-</template>
-
-<script>
-import ExecAction from '../js/ExecAction';
-import KeyboardShortcutParser from '../../common/js/KeyboardShortcutParser';
-import ShortcutButton from '../../common/components/ShortcutButton';
-import ComputeActionsMixin from '../../common/mixins/ComputeActionsMixin';
-import CropModePersistence from '../../common/enums/CropModePersistence.enum';
-import BrowserDetect from '../../ext/conf/BrowserDetect';
-
-export default {
-  data() {
-    return {
-      scope: 'page',
-      CropModePersistence: CropModePersistence,
-    }
-  },
-  mixins: [
-    ComputeActionsMixin
-  ],
-  props: [
-    'settings',
-    'frame',
-    'zoom',
-    'someSitesDisabledWarning',
-    'cropModePersistence',
-  ],
-  created() {
-    this.exec = new ExecAction(this.settings);
-  },
-  components: {
-    ShortcutButton,
-  },
-  computed: {
-    logarithmicZoom: function(){
-      return Math.log2(this.zoom);
-    }
-  },
-  methods: {
-    async openOptionsPage() {
-      if (BrowserDetect.firefox) {
-        browser.runtime.openOptionsPage();
-      } else {
-        chrome.runtime.openOptionsPage();
-      }
-    },
-    execAction(action) {
-      this.exec.exec(action, 'page', this.frame);
-    },
-    parseShortcut(action) {
-      if (! action.scopes.page.shortcut) {
-        return '';
-      }
-      return KeyboardShortcutParser.parseShortcut(action.scopes.page.shortcut[0]);
-    },
-    resetZoom() {
-      this.zoom = 1;
-    },
-    changeZoom(nz) {
-      nz = Math.pow(2, nz);
-      this.$emit('zoom-change', nz);
-      this.exec.exec(
-        {cmd: [{action: 'set-zoom', arg: nz}]},
-        'page',
-        this.frame
-      );
-    }
-  }
-}
-</script>
-
-<style>
-.b3 {
-  width: 9rem;
-  padding-left: 0.33rem;
-  padding-right: 0.33rem;
-}
-.input-slider {
-  width: 480px;
-}
-.warning-lite {
-  padding-right: 16px;
-  padding-bottom: 16px;
-  padding-top: 8px;
-}
-
-</style>