391 files changed, 0 insertions, 16003 deletions

diff --git a/shared/core-utils/abuse/abuse-predefined-reasons.ts b/shared/core-utils/abuse/abuse-predefined-reasons.ts
deleted file mode 100644
index 9967e54dd..000000000
--- a/shared/core-utils/abuse/abuse-predefined-reasons.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { AbusePredefinedReasons, AbusePredefinedReasonsString } from '../../models/moderation/abuse/abuse-reason.model'
-
-export const abusePredefinedReasonsMap: {
-  [key in AbusePredefinedReasonsString]: AbusePredefinedReasons
-} = {
-  violentOrRepulsive: AbusePredefinedReasons.VIOLENT_OR_REPULSIVE,
-  hatefulOrAbusive: AbusePredefinedReasons.HATEFUL_OR_ABUSIVE,
-  spamOrMisleading: AbusePredefinedReasons.SPAM_OR_MISLEADING,
-  privacy: AbusePredefinedReasons.PRIVACY,
-  rights: AbusePredefinedReasons.RIGHTS,
-  serverRules: AbusePredefinedReasons.SERVER_RULES,
-  thumbnails: AbusePredefinedReasons.THUMBNAILS,
-  captions: AbusePredefinedReasons.CAPTIONS
-}
diff --git a/shared/core-utils/abuse/index.ts b/shared/core-utils/abuse/index.ts
deleted file mode 100644
index 244b83cff..000000000
--- a/shared/core-utils/abuse/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './abuse-predefined-reasons'
diff --git a/shared/core-utils/common/array.ts b/shared/core-utils/common/array.ts
deleted file mode 100644
index 878ed1ffe..000000000
--- a/shared/core-utils/common/array.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-function findCommonElement <T> (array1: T[], array2: T[]) {
-  for (const a of array1) {
-    for (const b of array2) {
-      if (a === b) return a
-    }
-  }
-
-  return null
-}
-
-// Avoid conflict with other toArray() functions
-function arrayify <T> (element: T | T[]) {
-  if (Array.isArray(element)) return element
-
-  return [ element ]
-}
-
-// Avoid conflict with other uniq() functions
-function uniqify <T> (elements: T[]) {
-  return Array.from(new Set(elements))
-}
-
-// Thanks: https://stackoverflow.com/a/12646864
-function shuffle <T> (elements: T[]) {
-  const shuffled = [ ...elements ]
-
-  for (let i = shuffled.length - 1; i > 0; i--) {
-    const j = Math.floor(Math.random() * (i + 1));
-
-    [ shuffled[i], shuffled[j] ] = [ shuffled[j], shuffled[i] ]
-  }
-
-  return shuffled
-}
-
-export {
-  uniqify,
-  findCommonElement,
-  shuffle,
-  arrayify
-}
diff --git a/shared/core-utils/common/date.ts b/shared/core-utils/common/date.ts
deleted file mode 100644
index f0684ff86..000000000
--- a/shared/core-utils/common/date.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-function isToday (d: Date) {
-  const today = new Date()
-
-  return areDatesEqual(d, today)
-}
-
-function isYesterday (d: Date) {
-  const yesterday = new Date()
-  yesterday.setDate(yesterday.getDate() - 1)
-
-  return areDatesEqual(d, yesterday)
-}
-
-function isThisWeek (d: Date) {
-  const minDateOfThisWeek = new Date()
-  minDateOfThisWeek.setHours(0, 0, 0)
-
-  // getDay() -> Sunday - Saturday : 0 - 6
-  // We want to start our week on Monday
-  let dayOfWeek = minDateOfThisWeek.getDay() - 1
-  if (dayOfWeek < 0) dayOfWeek = 6 // Sunday
-
-  minDateOfThisWeek.setDate(minDateOfThisWeek.getDate() - dayOfWeek)
-
-  return d >= minDateOfThisWeek
-}
-
-function isThisMonth (d: Date) {
-  const thisMonth = new Date().getMonth()
-
-  return d.getMonth() === thisMonth
-}
-
-function isLastMonth (d: Date) {
-  const now = new Date()
-
-  return getDaysDifferences(now, d) <= 30
-}
-
-function isLastWeek (d: Date) {
-  const now = new Date()
-
-  return getDaysDifferences(now, d) <= 7
-}
-
-// ---------------------------------------------------------------------------
-
-function timeToInt (time: number | string) {
-  if (!time) return 0
-  if (typeof time === 'number') return time
-
-  const reg = /^((\d+)[h:])?((\d+)[m:])?((\d+)s?)?$/
-  const matches = time.match(reg)
-
-  if (!matches) return 0
-
-  const hours = parseInt(matches[2] || '0', 10)
-  const minutes = parseInt(matches[4] || '0', 10)
-  const seconds = parseInt(matches[6] || '0', 10)
-
-  return hours * 3600 + minutes * 60 + seconds
-}
-
-function secondsToTime (seconds: number, full = false, symbol?: string) {
-  let time = ''
-
-  if (seconds === 0 && !full) return '0s'
-
-  const hourSymbol = (symbol || 'h')
-  const minuteSymbol = (symbol || 'm')
-  const secondsSymbol = full ? '' : 's'
-
-  const hours = Math.floor(seconds / 3600)
-  if (hours >= 1) time = hours + hourSymbol
-  else if (full) time = '0' + hourSymbol
-
-  seconds %= 3600
-  const minutes = Math.floor(seconds / 60)
-  if (minutes >= 1 && minutes < 10 && full) time += '0' + minutes + minuteSymbol
-  else if (minutes >= 1) time += minutes + minuteSymbol
-  else if (full) time += '00' + minuteSymbol
-
-  seconds %= 60
-  if (seconds >= 1 && seconds < 10 && full) time += '0' + seconds + secondsSymbol
-  else if (seconds >= 1) time += seconds + secondsSymbol
-  else if (full) time += '00'
-
-  return time
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  isYesterday,
-  isThisWeek,
-  isThisMonth,
-  isToday,
-  isLastMonth,
-  isLastWeek,
-  timeToInt,
-  secondsToTime
-}
-
-// ---------------------------------------------------------------------------
-
-function areDatesEqual (d1: Date, d2: Date) {
-  return d1.getFullYear() === d2.getFullYear() &&
-    d1.getMonth() === d2.getMonth() &&
-    d1.getDate() === d2.getDate()
-}
-
-function getDaysDifferences (d1: Date, d2: Date) {
-  return (d1.getTime() - d2.getTime()) / (86400000)
-}
diff --git a/shared/core-utils/common/env.ts b/shared/core-utils/common/env.ts
deleted file mode 100644
index 973f895d4..000000000
--- a/shared/core-utils/common/env.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-function parallelTests () {
-  return process.env.MOCHA_PARALLEL === 'true'
-}
-
-function isGithubCI () {
-  return !!process.env.GITHUB_WORKSPACE
-}
-
-function areHttpImportTestsDisabled () {
-  const disabled = process.env.DISABLE_HTTP_IMPORT_TESTS === 'true'
-
-  if (disabled) console.log('DISABLE_HTTP_IMPORT_TESTS env set to "true" so import tests are disabled')
-
-  return disabled
-}
-
-function areMockObjectStorageTestsDisabled () {
-  const disabled = process.env.ENABLE_OBJECT_STORAGE_TESTS !== 'true'
-
-  if (disabled) console.log('ENABLE_OBJECT_STORAGE_TESTS env is not set to "true" so object storage tests are disabled')
-
-  return disabled
-}
-
-function areScalewayObjectStorageTestsDisabled () {
-  if (areMockObjectStorageTestsDisabled()) return true
-
-  const enabled = process.env.OBJECT_STORAGE_SCALEWAY_KEY_ID && process.env.OBJECT_STORAGE_SCALEWAY_ACCESS_KEY
-  if (!enabled) {
-    console.log(
-      'OBJECT_STORAGE_SCALEWAY_KEY_ID and/or OBJECT_STORAGE_SCALEWAY_ACCESS_KEY are not set, so scaleway object storage tests are disabled'
-    )
-
-    return true
-  }
-
-  return false
-}
-
-export {
-  parallelTests,
-  isGithubCI,
-  areHttpImportTestsDisabled,
-  areMockObjectStorageTestsDisabled,
-  areScalewayObjectStorageTestsDisabled
-}
diff --git a/shared/core-utils/common/index.ts b/shared/core-utils/common/index.ts
deleted file mode 100644
index 8d63ee1b2..000000000
--- a/shared/core-utils/common/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export * from './array'
-export * from './random'
-export * from './date'
-export * from './env'
-export * from './number'
-export * from './object'
-export * from './path'
-export * from './regexp'
-export * from './time'
-export * from './promises'
-export * from './url'
-export * from './version'
diff --git a/shared/core-utils/common/number.ts b/shared/core-utils/common/number.ts
deleted file mode 100644
index ce5a6041a..000000000
--- a/shared/core-utils/common/number.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export function forceNumber (value: any) {
-  return parseInt(value + '')
-}
-
-export function isOdd (num: number) {
-  return (num % 2) !== 0
-}
-
-export function toEven (num: number) {
-  if (isOdd(num)) return num + 1
-
-  return num
-}
diff --git a/shared/core-utils/common/object.ts b/shared/core-utils/common/object.ts
deleted file mode 100644
index 1276bfcc7..000000000
--- a/shared/core-utils/common/object.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-function pick <O extends object, K extends keyof O> (object: O, keys: K[]): Pick<O, K> {
-  const result: any = {}
-
-  for (const key of keys) {
-    if (Object.prototype.hasOwnProperty.call(object, key)) {
-      result[key] = object[key]
-    }
-  }
-
-  return result
-}
-
-function omit <O extends object, K extends keyof O> (object: O, keys: K[]): Exclude<O, K> {
-  const result: any = {}
-  const keysSet = new Set(keys) as Set<string>
-
-  for (const [ key, value ] of Object.entries(object)) {
-    if (keysSet.has(key)) continue
-
-    result[key] = value
-  }
-
-  return result
-}
-
-function objectKeysTyped <O extends object, K extends keyof O> (object: O): K[] {
-  return (Object.keys(object) as K[])
-}
-
-function getKeys <O extends object, K extends keyof O> (object: O, keys: K[]): K[] {
-  return (Object.keys(object) as K[]).filter(k => keys.includes(k))
-}
-
-function hasKey <T extends object> (obj: T, k: keyof any): k is keyof T {
-  return k in obj
-}
-
-function sortObjectComparator (key: string, order: 'asc' | 'desc') {
-  return (a: any, b: any) => {
-    if (a[key] < b[key]) {
-      return order === 'asc' ? -1 : 1
-    }
-
-    if (a[key] > b[key]) {
-      return order === 'asc' ? 1 : -1
-    }
-
-    return 0
-  }
-}
-
-function shallowCopy <T> (o: T): T {
-  return Object.assign(Object.create(Object.getPrototypeOf(o)), o)
-}
-
-function simpleObjectsDeepEqual (a: any, b: any) {
-  if (a === b) return true
-
-  if (typeof a !== 'object' || typeof b !== 'object' || a === null || b === null) {
-    return false
-  }
-
-  const keysA = Object.keys(a)
-  const keysB = Object.keys(b)
-
-  if (keysA.length !== keysB.length) return false
-
-  for (const key of keysA) {
-    if (!keysB.includes(key)) return false
-
-    if (!simpleObjectsDeepEqual(a[key], b[key])) return false
-  }
-
-  return true
-}
-
-export {
-  pick,
-  omit,
-  objectKeysTyped,
-  getKeys,
-  hasKey,
-  shallowCopy,
-  sortObjectComparator,
-  simpleObjectsDeepEqual
-}
diff --git a/shared/core-utils/common/path.ts b/shared/core-utils/common/path.ts
deleted file mode 100644
index 006505316..000000000
--- a/shared/core-utils/common/path.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { basename, extname, isAbsolute, join, resolve } from 'path'
-
-let rootPath: string
-
-function root () {
-  if (rootPath) return rootPath
-
-  rootPath = __dirname
-
-  if (basename(rootPath) === 'tools') rootPath = resolve(rootPath, '..')
-  if (basename(rootPath) === 'scripts') rootPath = resolve(rootPath, '..')
-  if (basename(rootPath) === 'common') rootPath = resolve(rootPath, '..')
-  if (basename(rootPath) === 'core-utils') rootPath = resolve(rootPath, '..')
-  if (basename(rootPath) === 'shared') rootPath = resolve(rootPath, '..')
-  if (basename(rootPath) === 'server') rootPath = resolve(rootPath, '..')
-  if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
-
-  return rootPath
-}
-
-function buildPath (path: string) {
-  if (isAbsolute(path)) return path
-
-  return join(root(), path)
-}
-
-function getLowercaseExtension (filename: string) {
-  const ext = extname(filename) || ''
-
-  return ext.toLowerCase()
-}
-
-function buildAbsoluteFixturePath (path: string, customCIPath = false) {
-  if (isAbsolute(path)) return path
-
-  if (customCIPath && process.env.GITHUB_WORKSPACE) {
-    return join(process.env.GITHUB_WORKSPACE, 'fixtures', path)
-  }
-
-  return join(root(), 'server', 'tests', 'fixtures', path)
-}
-
-export {
-  root,
-  buildPath,
-  buildAbsoluteFixturePath,
-  getLowercaseExtension
-}
diff --git a/shared/core-utils/common/promises.ts b/shared/core-utils/common/promises.ts
deleted file mode 100644
index e3792d12e..000000000
--- a/shared/core-utils/common/promises.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-export function isPromise <T = unknown> (value: T | Promise<T>): value is Promise<T> {
-  return value && typeof (value as Promise<T>).then === 'function'
-}
-
-export function isCatchable (value: any) {
-  return value && typeof value.catch === 'function'
-}
-
-export function timeoutPromise <T> (promise: Promise<T>, timeoutMs: number) {
-  let timer: ReturnType<typeof setTimeout>
-
-  return Promise.race([
-    promise,
-
-    new Promise((_res, rej) => {
-      timer = setTimeout(() => rej(new Error('Timeout')), timeoutMs)
-    })
-  ]).finally(() => clearTimeout(timer))
-}
-
-export function promisify0<A> (func: (cb: (err: any, result: A) => void) => void): () => Promise<A> {
-  return function promisified (): Promise<A> {
-    return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => {
-      // eslint-disable-next-line no-useless-call
-      func.apply(null, [ (err: any, res: A) => err ? reject(err) : resolve(res) ])
-    })
-  }
-}
-
-// Thanks to https://gist.github.com/kumasento/617daa7e46f13ecdd9b2
-export function promisify1<T, A> (func: (arg: T, cb: (err: any, result: A) => void) => void): (arg: T) => Promise<A> {
-  return function promisified (arg: T): Promise<A> {
-    return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => {
-      // eslint-disable-next-line no-useless-call
-      func.apply(null, [ arg, (err: any, res: A) => err ? reject(err) : resolve(res) ])
-    })
-  }
-}
-
-// eslint-disable-next-line max-len
-export function promisify2<T, U, A> (func: (arg1: T, arg2: U, cb: (err: any, result: A) => void) => void): (arg1: T, arg2: U) => Promise<A> {
-  return function promisified (arg1: T, arg2: U): Promise<A> {
-    return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => {
-      // eslint-disable-next-line no-useless-call
-      func.apply(null, [ arg1, arg2, (err: any, res: A) => err ? reject(err) : resolve(res) ])
-    })
-  }
-}
-
-// eslint-disable-next-line max-len
-export function promisify3<T, U, V, A> (func: (arg1: T, arg2: U, arg3: V, cb: (err: any, result: A) => void) => void): (arg1: T, arg2: U, arg3: V) => Promise<A> {
-  return function promisified (arg1: T, arg2: U, arg3: V): Promise<A> {
-    return new Promise<A>((resolve: (arg: A) => void, reject: (err: any) => void) => {
-      // eslint-disable-next-line no-useless-call
-      func.apply(null, [ arg1, arg2, arg3, (err: any, res: A) => err ? reject(err) : resolve(res) ])
-    })
-  }
-}
diff --git a/shared/core-utils/common/random.ts b/shared/core-utils/common/random.ts
deleted file mode 100644
index 705735d09..000000000
--- a/shared/core-utils/common/random.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// high excluded
-function randomInt (low: number, high: number) {
-  return Math.floor(Math.random() * (high - low) + low)
-}
-
-export {
-  randomInt
-}
diff --git a/shared/core-utils/common/regexp.ts b/shared/core-utils/common/regexp.ts
deleted file mode 100644
index 59eb87eb6..000000000
--- a/shared/core-utils/common/regexp.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const uuidRegex = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
-
-export function removeFragmentedMP4Ext (path: string) {
-  return path.replace(/-fragmented.mp4$/i, '')
-}
diff --git a/shared/core-utils/common/time.ts b/shared/core-utils/common/time.ts
deleted file mode 100644
index 2992609ca..000000000
--- a/shared/core-utils/common/time.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-function wait (milliseconds: number) {
-  return new Promise(resolve => setTimeout(resolve, milliseconds))
-}
-
-export {
-  wait
-}
diff --git a/shared/core-utils/common/url.ts b/shared/core-utils/common/url.ts
deleted file mode 100644
index 33fc5ee3a..000000000
--- a/shared/core-utils/common/url.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { Video, VideoPlaylist } from '../../models'
-import { secondsToTime } from './date'
-
-function addQueryParams (url: string, params: { [ id: string ]: string }) {
-  const objUrl = new URL(url)
-
-  for (const key of Object.keys(params)) {
-    objUrl.searchParams.append(key, params[key])
-  }
-
-  return objUrl.toString()
-}
-
-function removeQueryParams (url: string) {
-  const objUrl = new URL(url)
-
-  objUrl.searchParams.forEach((_v, k) => objUrl.searchParams.delete(k))
-
-  return objUrl.toString()
-}
-
-function buildPlaylistLink (playlist: Pick<VideoPlaylist, 'shortUUID'>, base?: string) {
-  return (base ?? window.location.origin) + buildPlaylistWatchPath(playlist)
-}
-
-function buildPlaylistWatchPath (playlist: Pick<VideoPlaylist, 'shortUUID'>) {
-  return '/w/p/' + playlist.shortUUID
-}
-
-function buildVideoWatchPath (video: Pick<Video, 'shortUUID'>) {
-  return '/w/' + video.shortUUID
-}
-
-function buildVideoLink (video: Pick<Video, 'shortUUID'>, base?: string) {
-  return (base ?? window.location.origin) + buildVideoWatchPath(video)
-}
-
-function buildPlaylistEmbedPath (playlist: Pick<VideoPlaylist, 'uuid'>) {
-  return '/video-playlists/embed/' + playlist.uuid
-}
-
-function buildPlaylistEmbedLink (playlist: Pick<VideoPlaylist, 'uuid'>, base?: string) {
-  return (base ?? window.location.origin) + buildPlaylistEmbedPath(playlist)
-}
-
-function buildVideoEmbedPath (video: Pick<Video, 'uuid'>) {
-  return '/videos/embed/' + video.uuid
-}
-
-function buildVideoEmbedLink (video: Pick<Video, 'uuid'>, base?: string) {
-  return (base ?? window.location.origin) + buildVideoEmbedPath(video)
-}
-
-function decorateVideoLink (options: {
-  url: string
-
-  startTime?: number
-  stopTime?: number
-
-  subtitle?: string
-
-  loop?: boolean
-  autoplay?: boolean
-  muted?: boolean
-
-  // Embed options
-  title?: boolean
-  warningTitle?: boolean
-
-  controls?: boolean
-  controlBar?: boolean
-
-  peertubeLink?: boolean
-  p2p?: boolean
-}) {
-  const { url } = options
-
-  const params = new URLSearchParams()
-
-  if (options.startTime !== undefined && options.startTime !== null) {
-    const startTimeInt = Math.floor(options.startTime)
-    params.set('start', secondsToTime(startTimeInt))
-  }
-
-  if (options.stopTime) {
-    const stopTimeInt = Math.floor(options.stopTime)
-    params.set('stop', secondsToTime(stopTimeInt))
-  }
-
-  if (options.subtitle) params.set('subtitle', options.subtitle)
-
-  if (options.loop === true) params.set('loop', '1')
-  if (options.autoplay === true) params.set('autoplay', '1')
-  if (options.muted === true) params.set('muted', '1')
-  if (options.title === false) params.set('title', '0')
-  if (options.warningTitle === false) params.set('warningTitle', '0')
-
-  if (options.controls === false) params.set('controls', '0')
-  if (options.controlBar === false) params.set('controlBar', '0')
-
-  if (options.peertubeLink === false) params.set('peertubeLink', '0')
-  if (options.p2p !== undefined) params.set('p2p', options.p2p ? '1' : '0')
-
-  return buildUrl(url, params)
-}
-
-function decoratePlaylistLink (options: {
-  url: string
-
-  playlistPosition?: number
-}) {
-  const { url } = options
-
-  const params = new URLSearchParams()
-
-  if (options.playlistPosition) params.set('playlistPosition', '' + options.playlistPosition)
-
-  return buildUrl(url, params)
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  addQueryParams,
-  removeQueryParams,
-
-  buildPlaylistLink,
-  buildVideoLink,
-
-  buildVideoWatchPath,
-  buildPlaylistWatchPath,
-
-  buildPlaylistEmbedPath,
-  buildVideoEmbedPath,
-
-  buildPlaylistEmbedLink,
-  buildVideoEmbedLink,
-
-  decorateVideoLink,
-  decoratePlaylistLink
-}
-
-function buildUrl (url: string, params: URLSearchParams) {
-  let hasParams = false
-  params.forEach(() => { hasParams = true })
-
-  if (hasParams) return url + '?' + params.toString()
-
-  return url
-}
diff --git a/shared/core-utils/common/version.ts b/shared/core-utils/common/version.ts
deleted file mode 100644
index 305287233..000000000
--- a/shared/core-utils/common/version.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Thanks https://gist.github.com/iwill/a83038623ba4fef6abb9efca87ae9ccb
-function compareSemVer (a: string, b: string) {
-  if (a.startsWith(b + '-')) return -1
-  if (b.startsWith(a + '-')) return 1
-
-  return a.localeCompare(b, undefined, { numeric: true, sensitivity: 'case', caseFirst: 'upper' })
-}
-
-export {
-  compareSemVer
-}
diff --git a/shared/core-utils/i18n/i18n.ts b/shared/core-utils/i18n/i18n.ts
deleted file mode 100644
index 54b54077a..000000000
--- a/shared/core-utils/i18n/i18n.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-export const LOCALE_FILES = [ 'player', 'server' ]
-
-export const I18N_LOCALES = {
-  // Always first to avoid issues when using express acceptLanguages function when no accept language header is set
-  'en-US': 'English',
-
-  // Keep it alphabetically sorted
-  'ar': 'العربية',
-  'ca-ES': 'Català',
-  'cs-CZ': 'Čeština',
-  'de-DE': 'Deutsch',
-  'el-GR': 'ελληνικά',
-  'eo': 'Esperanto',
-  'es-ES': 'Español',
-  'eu-ES': 'Euskara',
-  'fa-IR': 'فارسی',
-  'fi-FI': 'Suomi',
-  'fr-FR': 'Français',
-  'gd': 'Gàidhlig',
-  'gl-ES': 'Galego',
-  'hr': 'Hrvatski',
-  'hu-HU': 'Magyar',
-  'is': 'Íslenska',
-  'it-IT': 'Italiano',
-  'ja-JP': '日本語',
-  'kab': 'Taqbaylit',
-  'nb-NO': 'Norsk bokmål',
-  'nl-NL': 'Nederlands',
-  'nn': 'Norsk nynorsk',
-  'oc': 'Occitan',
-  'pl-PL': 'Polski',
-  'pt-BR': 'Português (Brasil)',
-  'pt-PT': 'Português (Portugal)',
-  'ru-RU': 'Pусский',
-  'sq': 'Shqip',
-  'sv-SE': 'Svenska',
-  'th-TH': 'ไทย',
-  'tok': 'Toki Pona',
-  'uk-UA': 'украї́нська мо́ва',
-  'vi-VN': 'Tiếng Việt',
-  'zh-Hans-CN': '简体中文（中国）',
-  'zh-Hant-TW': '繁體中文（台灣）'
-}
-
-// Keep it alphabetically sorted
-const I18N_LOCALE_ALIAS = {
-  'ar-001': 'ar',
-  'ca': 'ca-ES',
-  'cs': 'cs-CZ',
-  'de': 'de-DE',
-  'el': 'el-GR',
-  'en': 'en-US',
-  'es': 'es-ES',
-  'eu': 'eu-ES',
-  'fa': 'fa-IR',
-  'fi': 'fi-FI',
-  'fr': 'fr-FR',
-  'gl': 'gl-ES',
-  'hu': 'hu-HU',
-  'it': 'it-IT',
-  'ja': 'ja-JP',
-  'nb': 'nb-NO',
-  'nl': 'nl-NL',
-  'pl': 'pl-PL',
-  'pt': 'pt-BR',
-  'ru': 'ru-RU',
-  'sv': 'sv-SE',
-  'th': 'th-TH',
-  'uk': 'uk-UA',
-  'vi': 'vi-VN',
-  'zh-CN': 'zh-Hans-CN',
-  'zh-Hans': 'zh-Hans-CN',
-  'zh-Hant': 'zh-Hant-TW',
-  'zh-TW': 'zh-Hant-TW',
-  'zh': 'zh-Hans-CN'
-}
-
-export const POSSIBLE_LOCALES = (Object.keys(I18N_LOCALES) as string[]).concat(Object.keys(I18N_LOCALE_ALIAS))
-
-export function getDefaultLocale () {
-  return 'en-US'
-}
-
-export function isDefaultLocale (locale: string) {
-  return getCompleteLocale(locale) === getCompleteLocale(getDefaultLocale())
-}
-
-export function peertubeTranslate (str: string, translations?: { [ id: string ]: string }) {
-  if (!translations?.[str]) return str
-
-  return translations[str]
-}
-
-const possiblePaths = POSSIBLE_LOCALES.map(l => '/' + l)
-export function is18nPath (path: string) {
-  return possiblePaths.includes(path)
-}
-
-export function is18nLocale (locale: string) {
-  return POSSIBLE_LOCALES.includes(locale)
-}
-
-export function getCompleteLocale (locale: string) {
-  if (!locale) return locale
-
-  const found = (I18N_LOCALE_ALIAS as any)[locale] as string
-
-  return found || locale
-}
-
-export function getShortLocale (locale: string) {
-  if (locale.includes('-') === false) return locale
-
-  return locale.split('-')[0]
-}
-
-export function buildFileLocale (locale: string) {
-  return getCompleteLocale(locale)
-}
diff --git a/shared/core-utils/i18n/index.ts b/shared/core-utils/i18n/index.ts
deleted file mode 100644
index 8f7cbe2c7..000000000
--- a/shared/core-utils/i18n/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './i18n'
diff --git a/shared/core-utils/index.ts b/shared/core-utils/index.ts
deleted file mode 100644
index 8daaa2d04..000000000
--- a/shared/core-utils/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './abuse'
-export * from './common'
-export * from './i18n'
-export * from './plugins'
-export * from './renderer'
-export * from './users'
-export * from './videos'
diff --git a/shared/core-utils/plugins/hooks.ts b/shared/core-utils/plugins/hooks.ts
deleted file mode 100644
index 96bcc945e..000000000
--- a/shared/core-utils/plugins/hooks.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { RegisteredExternalAuthConfig } from '@shared/models'
-import { HookType } from '../../models/plugins/hook-type.enum'
-import { isCatchable, isPromise } from '../common/promises'
-
-function getHookType (hookName: string) {
-  if (hookName.startsWith('filter:')) return HookType.FILTER
-  if (hookName.startsWith('action:')) return HookType.ACTION
-
-  return HookType.STATIC
-}
-
-async function internalRunHook <T> (options: {
-  handler: Function
-  hookType: HookType
-  result: T
-  params: any
-  onError: (err: Error) => void
-}) {
-  const { handler, hookType, result, params, onError } = options
-
-  try {
-    if (hookType === HookType.FILTER) {
-      const p = handler(result, params)
-
-      const newResult = isPromise(p)
-        ? await p
-        : p
-
-      return newResult
-    }
-
-    // Action/static hooks do not have result value
-    const p = handler(params)
-
-    if (hookType === HookType.STATIC) {
-      if (isPromise(p)) await p
-
-      return undefined
-    }
-
-    if (hookType === HookType.ACTION) {
-      if (isCatchable(p)) p.catch((err: any) => onError(err))
-
-      return undefined
-    }
-  } catch (err) {
-    onError(err)
-  }
-
-  return result
-}
-
-function getExternalAuthHref (apiUrl: string, auth: RegisteredExternalAuthConfig) {
-  return apiUrl + `/plugins/${auth.name}/${auth.version}/auth/${auth.authName}`
-}
-
-export {
-  getHookType,
-  internalRunHook,
-  getExternalAuthHref
-}
diff --git a/shared/core-utils/plugins/index.ts b/shared/core-utils/plugins/index.ts
deleted file mode 100644
index fc78d3512..000000000
--- a/shared/core-utils/plugins/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './hooks'
diff --git a/shared/core-utils/renderer/html.ts b/shared/core-utils/renderer/html.ts
deleted file mode 100644
index 365bf7612..000000000
--- a/shared/core-utils/renderer/html.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-export function getDefaultSanitizeOptions () {
-  return {
-    allowedTags: [ 'a', 'p', 'span', 'br', 'strong', 'em', 'ul', 'ol', 'li' ],
-    allowedSchemes: [ 'http', 'https' ],
-    allowedAttributes: {
-      'a': [ 'href', 'class', 'target', 'rel' ],
-      '*': [ 'data-*' ]
-    },
-    transformTags: {
-      a: (tagName: string, attribs: any) => {
-        let rel = 'noopener noreferrer'
-        if (attribs.rel === 'me') rel += ' me'
-
-        return {
-          tagName,
-          attribs: Object.assign(attribs, {
-            target: '_blank',
-            rel
-          })
-        }
-      }
-    }
-  }
-}
-
-export function getTextOnlySanitizeOptions () {
-  return {
-    allowedTags: [] as string[]
-  }
-}
-
-export function getCustomMarkupSanitizeOptions (additionalAllowedTags: string[] = []) {
-  const base = getDefaultSanitizeOptions()
-
-  return {
-    allowedTags: [
-      ...base.allowedTags,
-      ...additionalAllowedTags,
-      'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img'
-    ],
-    allowedSchemes: [
-      ...base.allowedSchemes,
-
-      'mailto'
-    ],
-    allowedAttributes: {
-      ...base.allowedAttributes,
-
-      'img': [ 'src', 'alt' ],
-      '*': [ 'data-*', 'style' ]
-    }
-  }
-}
-
-// Thanks: https://stackoverflow.com/a/12034334
-export function escapeHTML (stringParam: string) {
-  if (!stringParam) return ''
-
-  const entityMap: { [id: string ]: string } = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    '\'': '&#39;',
-    '/': '&#x2F;',
-    '`': '&#x60;',
-    '=': '&#x3D;'
-  }
-
-  return String(stringParam).replace(/[&<>"'`=/]/g, s => entityMap[s])
-}
diff --git a/shared/core-utils/renderer/index.ts b/shared/core-utils/renderer/index.ts
deleted file mode 100644
index 0ad29d782..000000000
--- a/shared/core-utils/renderer/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './markdown'
-export * from './html'
diff --git a/shared/core-utils/renderer/markdown.ts b/shared/core-utils/renderer/markdown.ts
deleted file mode 100644
index ddf608d7b..000000000
--- a/shared/core-utils/renderer/markdown.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export const TEXT_RULES = [
-  'linkify',
-  'autolink',
-  'emphasis',
-  'link',
-  'newline',
-  'entity',
-  'list'
-]
-
-export const TEXT_WITH_HTML_RULES = TEXT_RULES.concat([
-  'html_inline',
-  'html_block'
-])
-
-export const ENHANCED_RULES = TEXT_RULES.concat([ 'image' ])
-export const ENHANCED_WITH_HTML_RULES = TEXT_WITH_HTML_RULES.concat([ 'image' ])
-
-export const COMPLETE_RULES = ENHANCED_WITH_HTML_RULES.concat([
-  'block',
-  'inline',
-  'heading',
-  'paragraph'
-])
diff --git a/shared/core-utils/users/index.ts b/shared/core-utils/users/index.ts
deleted file mode 100644
index 1cbf0af1b..000000000
--- a/shared/core-utils/users/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './user-role'
diff --git a/shared/core-utils/users/user-role.ts b/shared/core-utils/users/user-role.ts
deleted file mode 100644
index 5f3b9a10f..000000000
--- a/shared/core-utils/users/user-role.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { UserRight, UserRole } from '../../models/users'
-
-export const USER_ROLE_LABELS: { [ id in UserRole ]: string } = {
-  [UserRole.USER]: 'User',
-  [UserRole.MODERATOR]: 'Moderator',
-  [UserRole.ADMINISTRATOR]: 'Administrator'
-}
-
-const userRoleRights: { [ id in UserRole ]: UserRight[] } = {
-  [UserRole.ADMINISTRATOR]: [
-    UserRight.ALL
-  ],
-
-  [UserRole.MODERATOR]: [
-    UserRight.MANAGE_VIDEO_BLACKLIST,
-    UserRight.MANAGE_ABUSES,
-    UserRight.MANAGE_ANY_VIDEO_CHANNEL,
-    UserRight.REMOVE_ANY_VIDEO,
-    UserRight.REMOVE_ANY_VIDEO_PLAYLIST,
-    UserRight.REMOVE_ANY_VIDEO_COMMENT,
-    UserRight.UPDATE_ANY_VIDEO,
-    UserRight.SEE_ALL_VIDEOS,
-    UserRight.MANAGE_ACCOUNTS_BLOCKLIST,
-    UserRight.MANAGE_SERVERS_BLOCKLIST,
-    UserRight.MANAGE_USERS,
-    UserRight.SEE_ALL_COMMENTS,
-    UserRight.MANAGE_REGISTRATIONS
-  ],
-
-  [UserRole.USER]: []
-}
-
-export function hasUserRight (userRole: UserRole, userRight: UserRight) {
-  const userRights = userRoleRights[userRole]
-
-  return userRights.includes(UserRight.ALL) || userRights.includes(userRight)
-}
diff --git a/shared/core-utils/videos/bitrate.ts b/shared/core-utils/videos/bitrate.ts
deleted file mode 100644
index 6be027826..000000000
--- a/shared/core-utils/videos/bitrate.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { VideoResolution } from '@shared/models'
-
-type BitPerPixel = { [ id in VideoResolution ]: number }
-
-// https://bitmovin.com/video-bitrate-streaming-hls-dash/
-
-const minLimitBitPerPixel: BitPerPixel = {
-  [VideoResolution.H_NOVIDEO]: 0,
-  [VideoResolution.H_144P]: 0.02,
-  [VideoResolution.H_240P]: 0.02,
-  [VideoResolution.H_360P]: 0.02,
-  [VideoResolution.H_480P]: 0.02,
-  [VideoResolution.H_720P]: 0.02,
-  [VideoResolution.H_1080P]: 0.02,
-  [VideoResolution.H_1440P]: 0.02,
-  [VideoResolution.H_4K]: 0.02
-}
-
-const averageBitPerPixel: BitPerPixel = {
-  [VideoResolution.H_NOVIDEO]: 0,
-  [VideoResolution.H_144P]: 0.19,
-  [VideoResolution.H_240P]: 0.17,
-  [VideoResolution.H_360P]: 0.15,
-  [VideoResolution.H_480P]: 0.12,
-  [VideoResolution.H_720P]: 0.11,
-  [VideoResolution.H_1080P]: 0.10,
-  [VideoResolution.H_1440P]: 0.09,
-  [VideoResolution.H_4K]: 0.08
-}
-
-const maxBitPerPixel: BitPerPixel = {
-  [VideoResolution.H_NOVIDEO]: 0,
-  [VideoResolution.H_144P]: 0.32,
-  [VideoResolution.H_240P]: 0.29,
-  [VideoResolution.H_360P]: 0.26,
-  [VideoResolution.H_480P]: 0.22,
-  [VideoResolution.H_720P]: 0.19,
-  [VideoResolution.H_1080P]: 0.17,
-  [VideoResolution.H_1440P]: 0.16,
-  [VideoResolution.H_4K]: 0.14
-}
-
-function getAverageTheoreticalBitrate (options: {
-  resolution: VideoResolution
-  ratio: number
-  fps: number
-}) {
-  const targetBitrate = calculateBitrate({ ...options, bitPerPixel: averageBitPerPixel })
-  if (!targetBitrate) return 192 * 1000
-
-  return targetBitrate
-}
-
-function getMaxTheoreticalBitrate (options: {
-  resolution: VideoResolution
-  ratio: number
-  fps: number
-}) {
-  const targetBitrate = calculateBitrate({ ...options, bitPerPixel: maxBitPerPixel })
-  if (!targetBitrate) return 256 * 1000
-
-  return targetBitrate
-}
-
-function getMinTheoreticalBitrate (options: {
-  resolution: VideoResolution
-  ratio: number
-  fps: number
-}) {
-  const minLimitBitrate = calculateBitrate({ ...options, bitPerPixel: minLimitBitPerPixel })
-  if (!minLimitBitrate) return 10 * 1000
-
-  return minLimitBitrate
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  getAverageTheoreticalBitrate,
-  getMaxTheoreticalBitrate,
-  getMinTheoreticalBitrate
-}
-
-// ---------------------------------------------------------------------------
-
-function calculateBitrate (options: {
-  bitPerPixel: BitPerPixel
-  resolution: VideoResolution
-  ratio: number
-  fps: number
-}) {
-  const { bitPerPixel, resolution, ratio, fps } = options
-
-  const resolutionsOrder = [
-    VideoResolution.H_4K,
-    VideoResolution.H_1440P,
-    VideoResolution.H_1080P,
-    VideoResolution.H_720P,
-    VideoResolution.H_480P,
-    VideoResolution.H_360P,
-    VideoResolution.H_240P,
-    VideoResolution.H_144P,
-    VideoResolution.H_NOVIDEO
-  ]
-
-  for (const toTestResolution of resolutionsOrder) {
-    if (toTestResolution <= resolution) {
-      return Math.floor(resolution * resolution * ratio * fps * bitPerPixel[toTestResolution])
-    }
-  }
-
-  throw new Error('Unknown resolution ' + resolution)
-}
diff --git a/shared/core-utils/videos/common.ts b/shared/core-utils/videos/common.ts
deleted file mode 100644
index 0431edaaf..000000000
--- a/shared/core-utils/videos/common.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { VideoStreamingPlaylistType } from '@shared/models'
-import { VideoPrivacy } from '../../models/videos/video-privacy.enum'
-import { VideoDetails } from '../../models/videos/video.model'
-
-function getAllPrivacies () {
-  return [ VideoPrivacy.PUBLIC, VideoPrivacy.INTERNAL, VideoPrivacy.PRIVATE, VideoPrivacy.UNLISTED, VideoPrivacy.PASSWORD_PROTECTED ]
-}
-
-function getAllFiles (video: Partial<Pick<VideoDetails, 'files' | 'streamingPlaylists'>>) {
-  const files = video.files
-
-  const hls = getHLS(video)
-  if (hls) return files.concat(hls.files)
-
-  return files
-}
-
-function getHLS (video: Partial<Pick<VideoDetails, 'streamingPlaylists'>>) {
-  return video.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS)
-}
-
-export {
-  getAllPrivacies,
-  getAllFiles,
-  getHLS
-}
diff --git a/shared/core-utils/videos/index.ts b/shared/core-utils/videos/index.ts
deleted file mode 100644
index 2cf319395..000000000
--- a/shared/core-utils/videos/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './bitrate'
-export * from './common'
diff --git a/shared/extra-utils/crypto.ts b/shared/extra-utils/crypto.ts
deleted file mode 100644
index 1a583f1a0..000000000
--- a/shared/extra-utils/crypto.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { BinaryToTextEncoding, createHash } from 'crypto'
-
-function sha256 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
-  return createHash('sha256').update(str).digest(encoding)
-}
-
-function sha1 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
-  return createHash('sha1').update(str).digest(encoding)
-}
-
-// high excluded
-function randomInt (low: number, high: number) {
-  return Math.floor(Math.random() * (high - low) + low)
-}
-
-export {
-  randomInt,
-  sha256,
-  sha1
-}
diff --git a/shared/extra-utils/file.ts b/shared/extra-utils/file.ts
deleted file mode 100644
index 8060ab520..000000000
--- a/shared/extra-utils/file.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { stat } from 'fs-extra'
-
-async function getFileSize (path: string) {
-  const stats = await stat(path)
-
-  return stats.size
-}
-
-export {
-  getFileSize
-}
diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
deleted file mode 100644
index d4cfcbec8..000000000
--- a/shared/extra-utils/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './crypto'
-export * from './file'
-export * from './uuid'
diff --git a/shared/extra-utils/uuid.ts b/shared/extra-utils/uuid.ts
deleted file mode 100644
index f3c80e046..000000000
--- a/shared/extra-utils/uuid.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import short, { uuid } from 'short-uuid'
-
-const translator = short()
-
-function buildUUID () {
-  return uuid()
-}
-
-function uuidToShort (uuid: string) {
-  if (!uuid) return uuid
-
-  return translator.fromUUID(uuid)
-}
-
-function shortToUUID (shortUUID: string) {
-  if (!shortUUID) return shortUUID
-
-  return translator.toUUID(shortUUID)
-}
-
-function isShortUUID (value: string) {
-  if (!value) return false
-
-  return value.length === translator.maxLength
-}
-
-export {
-  buildUUID,
-  uuidToShort,
-  shortToUUID,
-  isShortUUID
-}
diff --git a/shared/ffmpeg/ffmpeg-command-wrapper.ts b/shared/ffmpeg/ffmpeg-command-wrapper.ts
deleted file mode 100644
index efb75c198..000000000
--- a/shared/ffmpeg/ffmpeg-command-wrapper.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import ffmpeg, { FfmpegCommand, getAvailableEncoders } from 'fluent-ffmpeg'
-import { pick, promisify0 } from '@shared/core-utils'
-import { AvailableEncoders, EncoderOptionsBuilder, EncoderOptionsBuilderParams, EncoderProfile } from '@shared/models'
-
-type FFmpegLogger = {
-  info: (msg: string, obj?: any) => void
-  debug: (msg: string, obj?: any) => void
-  warn: (msg: string, obj?: any) => void
-  error: (msg: string, obj?: any) => void
-}
-
-export interface FFmpegCommandWrapperOptions {
-  availableEncoders?: AvailableEncoders
-  profile?: string
-
-  niceness: number
-  tmpDirectory: string
-  threads: number
-
-  logger: FFmpegLogger
-  lTags?: { tags: string[] }
-
-  updateJobProgress?: (progress?: number) => void
-  onEnd?: () => void
-  onError?: (err: Error) => void
-}
-
-export class FFmpegCommandWrapper {
-  private static supportedEncoders: Map<string, boolean>
-
-  private readonly availableEncoders: AvailableEncoders
-  private readonly profile: string
-
-  private readonly niceness: number
-  private readonly tmpDirectory: string
-  private readonly threads: number
-
-  private readonly logger: FFmpegLogger
-  private readonly lTags: { tags: string[] }
-
-  private readonly updateJobProgress: (progress?: number) => void
-  private readonly onEnd?: () => void
-  private readonly onError?: (err: Error) => void
-
-  private command: FfmpegCommand
-
-  constructor (options: FFmpegCommandWrapperOptions) {
-    this.availableEncoders = options.availableEncoders
-    this.profile = options.profile
-    this.niceness = options.niceness
-    this.tmpDirectory = options.tmpDirectory
-    this.threads = options.threads
-    this.logger = options.logger
-    this.lTags = options.lTags || { tags: [] }
-
-    this.updateJobProgress = options.updateJobProgress
-
-    this.onEnd = options.onEnd
-    this.onError = options.onError
-  }
-
-  getAvailableEncoders () {
-    return this.availableEncoders
-  }
-
-  getProfile () {
-    return this.profile
-  }
-
-  getCommand () {
-    return this.command
-  }
-
-  // ---------------------------------------------------------------------------
-
-  debugLog (msg: string, meta: any) {
-    this.logger.debug(msg, { ...meta, ...this.lTags })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  buildCommand (input: string) {
-    if (this.command) throw new Error('Command is already built')
-
-    // We set cwd explicitly because ffmpeg appears to create temporary files when trancoding which fails in read-only file systems
-    this.command = ffmpeg(input, {
-      niceness: this.niceness,
-      cwd: this.tmpDirectory
-    })
-
-    if (this.threads > 0) {
-      // If we don't set any threads ffmpeg will chose automatically
-      this.command.outputOption('-threads ' + this.threads)
-    }
-
-    return this.command
-  }
-
-  async runCommand (options: {
-    silent?: boolean // false by default
-  } = {}) {
-    const { silent = false } = options
-
-    return new Promise<void>((res, rej) => {
-      let shellCommand: string
-
-      this.command.on('start', cmdline => { shellCommand = cmdline })
-
-      this.command.on('error', (err, stdout, stderr) => {
-        if (silent !== true) this.logger.error('Error in ffmpeg.', { stdout, stderr, shellCommand, ...this.lTags })
-
-        if (this.onError) this.onError(err)
-
-        rej(err)
-      })
-
-      this.command.on('end', (stdout, stderr) => {
-        this.logger.debug('FFmpeg command ended.', { stdout, stderr, shellCommand, ...this.lTags })
-
-        if (this.onEnd) this.onEnd()
-
-        res()
-      })
-
-      if (this.updateJobProgress) {
-        this.command.on('progress', progress => {
-          if (!progress.percent) return
-
-          // Sometimes ffmpeg returns an invalid progress
-          let percent = Math.round(progress.percent)
-          if (percent < 0) percent = 0
-          if (percent > 100) percent = 100
-
-          this.updateJobProgress(percent)
-        })
-      }
-
-      this.command.run()
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  static resetSupportedEncoders () {
-    FFmpegCommandWrapper.supportedEncoders = undefined
-  }
-
-  // Run encoder builder depending on available encoders
-  // Try encoders by priority: if the encoder is available, run the chosen profile or fallback to the default one
-  // If the default one does not exist, check the next encoder
-  async getEncoderBuilderResult (options: EncoderOptionsBuilderParams & {
-    streamType: 'video' | 'audio'
-    input: string
-
-    videoType: 'vod' | 'live'
-  }) {
-    if (!this.availableEncoders) {
-      throw new Error('There is no available encoders')
-    }
-
-    const { streamType, videoType } = options
-
-    const encodersToTry = this.availableEncoders.encodersToTry[videoType][streamType]
-    const encoders = this.availableEncoders.available[videoType]
-
-    for (const encoder of encodersToTry) {
-      if (!(await this.checkFFmpegEncoders(this.availableEncoders)).get(encoder)) {
-        this.logger.debug(`Encoder ${encoder} not available in ffmpeg, skipping.`, this.lTags)
-        continue
-      }
-
-      if (!encoders[encoder]) {
-        this.logger.debug(`Encoder ${encoder} not available in peertube encoders, skipping.`, this.lTags)
-        continue
-      }
-
-      // An object containing available profiles for this encoder
-      const builderProfiles: EncoderProfile<EncoderOptionsBuilder> = encoders[encoder]
-      let builder = builderProfiles[this.profile]
-
-      if (!builder) {
-        this.logger.debug(`Profile ${this.profile} for encoder ${encoder} not available. Fallback to default.`, this.lTags)
-        builder = builderProfiles.default
-
-        if (!builder) {
-          this.logger.debug(`Default profile for encoder ${encoder} not available. Try next available encoder.`, this.lTags)
-          continue
-        }
-      }
-
-      const result = await builder(
-        pick(options, [
-          'input',
-          'canCopyAudio',
-          'canCopyVideo',
-          'resolution',
-          'inputBitrate',
-          'fps',
-          'inputRatio',
-          'streamNum'
-        ])
-      )
-
-      return {
-        result,
-
-        // If we don't have output options, then copy the input stream
-        encoder: result.copy === true
-          ? 'copy'
-          : encoder
-      }
-    }
-
-    return null
-  }
-
-  // Detect supported encoders by ffmpeg
-  private async checkFFmpegEncoders (peertubeAvailableEncoders: AvailableEncoders): Promise<Map<string, boolean>> {
-    if (FFmpegCommandWrapper.supportedEncoders !== undefined) {
-      return FFmpegCommandWrapper.supportedEncoders
-    }
-
-    const getAvailableEncodersPromise = promisify0(getAvailableEncoders)
-    const availableFFmpegEncoders = await getAvailableEncodersPromise()
-
-    const searchEncoders = new Set<string>()
-    for (const type of [ 'live', 'vod' ]) {
-      for (const streamType of [ 'audio', 'video' ]) {
-        for (const encoder of peertubeAvailableEncoders.encodersToTry[type][streamType]) {
-          searchEncoders.add(encoder)
-        }
-      }
-    }
-
-    const supportedEncoders = new Map<string, boolean>()
-
-    for (const searchEncoder of searchEncoders) {
-      supportedEncoders.set(searchEncoder, availableFFmpegEncoders[searchEncoder] !== undefined)
-    }
-
-    this.logger.info('Built supported ffmpeg encoders.', { supportedEncoders, searchEncoders, ...this.lTags })
-
-    FFmpegCommandWrapper.supportedEncoders = supportedEncoders
-    return supportedEncoders
-  }
-}
diff --git a/shared/ffmpeg/ffmpeg-default-transcoding-profile.ts b/shared/ffmpeg/ffmpeg-default-transcoding-profile.ts
deleted file mode 100644
index 8a3f32011..000000000
--- a/shared/ffmpeg/ffmpeg-default-transcoding-profile.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import { FfprobeData } from 'fluent-ffmpeg'
-import { getAverageTheoreticalBitrate, getMaxTheoreticalBitrate, getMinTheoreticalBitrate } from '@shared/core-utils'
-import {
-  buildStreamSuffix,
-  ffprobePromise,
-  getAudioStream,
-  getMaxAudioBitrate,
-  getVideoStream,
-  getVideoStreamBitrate,
-  getVideoStreamDimensionsInfo,
-  getVideoStreamFPS
-} from '@shared/ffmpeg'
-import { EncoderOptionsBuilder, EncoderOptionsBuilderParams, VideoResolution } from '@shared/models'
-
-const defaultX264VODOptionsBuilder: EncoderOptionsBuilder = (options: EncoderOptionsBuilderParams) => {
-  const { fps, inputRatio, inputBitrate, resolution } = options
-
-  const targetBitrate = getTargetBitrate({ inputBitrate, ratio: inputRatio, fps, resolution })
-
-  return {
-    outputOptions: [
-      ...getCommonOutputOptions(targetBitrate),
-
-      `-r ${fps}`
-    ]
-  }
-}
-
-const defaultX264LiveOptionsBuilder: EncoderOptionsBuilder = (options: EncoderOptionsBuilderParams) => {
-  const { streamNum, fps, inputBitrate, inputRatio, resolution } = options
-
-  const targetBitrate = getTargetBitrate({ inputBitrate, ratio: inputRatio, fps, resolution })
-
-  return {
-    outputOptions: [
-      ...getCommonOutputOptions(targetBitrate, streamNum),
-
-      `${buildStreamSuffix('-r:v', streamNum)} ${fps}`,
-      `${buildStreamSuffix('-b:v', streamNum)} ${targetBitrate}`
-    ]
-  }
-}
-
-const defaultAACOptionsBuilder: EncoderOptionsBuilder = async ({ input, streamNum, canCopyAudio }) => {
-  const probe = await ffprobePromise(input)
-
-  if (canCopyAudio && await canDoQuickAudioTranscode(input, probe)) {
-    return { copy: true, outputOptions: [ ] }
-  }
-
-  const parsedAudio = await getAudioStream(input, probe)
-
-  // We try to reduce the ceiling bitrate by making rough matches of bitrates
-  // Of course this is far from perfect, but it might save some space in the end
-
-  const audioCodecName = parsedAudio.audioStream['codec_name']
-
-  const bitrate = getMaxAudioBitrate(audioCodecName, parsedAudio.bitrate)
-
-  // Force stereo as it causes some issues with HLS playback in Chrome
-  const base = [ '-channel_layout', 'stereo' ]
-
-  if (bitrate !== -1) {
-    return { outputOptions: base.concat([ buildStreamSuffix('-b:a', streamNum), bitrate + 'k' ]) }
-  }
-
-  return { outputOptions: base }
-}
-
-const defaultLibFDKAACVODOptionsBuilder: EncoderOptionsBuilder = ({ streamNum }) => {
-  return { outputOptions: [ buildStreamSuffix('-q:a', streamNum), '5' ] }
-}
-
-export function getDefaultAvailableEncoders () {
-  return {
-    vod: {
-      libx264: {
-        default: defaultX264VODOptionsBuilder
-      },
-      aac: {
-        default: defaultAACOptionsBuilder
-      },
-      libfdk_aac: {
-        default: defaultLibFDKAACVODOptionsBuilder
-      }
-    },
-    live: {
-      libx264: {
-        default: defaultX264LiveOptionsBuilder
-      },
-      aac: {
-        default: defaultAACOptionsBuilder
-      }
-    }
-  }
-}
-
-export function getDefaultEncodersToTry () {
-  return {
-    vod: {
-      video: [ 'libx264' ],
-      audio: [ 'libfdk_aac', 'aac' ]
-    },
-
-    live: {
-      video: [ 'libx264' ],
-      audio: [ 'libfdk_aac', 'aac' ]
-    }
-  }
-}
-
-export async function canDoQuickAudioTranscode (path: string, probe?: FfprobeData): Promise<boolean> {
-  const parsedAudio = await getAudioStream(path, probe)
-
-  if (!parsedAudio.audioStream) return true
-
-  if (parsedAudio.audioStream['codec_name'] !== 'aac') return false
-
-  const audioBitrate = parsedAudio.bitrate
-  if (!audioBitrate) return false
-
-  const maxAudioBitrate = getMaxAudioBitrate('aac', audioBitrate)
-  if (maxAudioBitrate !== -1 && audioBitrate > maxAudioBitrate) return false
-
-  const channelLayout = parsedAudio.audioStream['channel_layout']
-  // Causes playback issues with Chrome
-  if (!channelLayout || channelLayout === 'unknown' || channelLayout === 'quad') return false
-
-  return true
-}
-
-export async function canDoQuickVideoTranscode (path: string, probe?: FfprobeData): Promise<boolean> {
-  const videoStream = await getVideoStream(path, probe)
-  const fps = await getVideoStreamFPS(path, probe)
-  const bitRate = await getVideoStreamBitrate(path, probe)
-  const resolutionData = await getVideoStreamDimensionsInfo(path, probe)
-
-  // If ffprobe did not manage to guess the bitrate
-  if (!bitRate) return false
-
-  // check video params
-  if (!videoStream) return false
-  if (videoStream['codec_name'] !== 'h264') return false
-  if (videoStream['pix_fmt'] !== 'yuv420p') return false
-  if (fps < 2 || fps > 65) return false
-  if (bitRate > getMaxTheoreticalBitrate({ ...resolutionData, fps })) return false
-
-  return true
-}
-
-// ---------------------------------------------------------------------------
-
-function getTargetBitrate (options: {
-  inputBitrate: number
-  resolution: VideoResolution
-  ratio: number
-  fps: number
-}) {
-  const { inputBitrate, resolution, ratio, fps } = options
-
-  const capped = capBitrate(inputBitrate, getAverageTheoreticalBitrate({ resolution, fps, ratio }))
-  const limit = getMinTheoreticalBitrate({ resolution, fps, ratio })
-
-  return Math.max(limit, capped)
-}
-
-function capBitrate (inputBitrate: number, targetBitrate: number) {
-  if (!inputBitrate) return targetBitrate
-
-  // Add 30% margin to input bitrate
-  const inputBitrateWithMargin = inputBitrate + (inputBitrate * 0.3)
-
-  return Math.min(targetBitrate, inputBitrateWithMargin)
-}
-
-function getCommonOutputOptions (targetBitrate: number, streamNum?: number) {
-  return [
-    `-preset veryfast`,
-    `${buildStreamSuffix('-maxrate:v', streamNum)} ${targetBitrate}`,
-    `${buildStreamSuffix('-bufsize:v', streamNum)} ${targetBitrate * 2}`,
-
-    // NOTE: b-strategy 1 - heuristic algorithm, 16 is optimal B-frames for it
-    `-b_strategy 1`,
-    // NOTE: Why 16: https://github.com/Chocobozzz/PeerTube/pull/774. b-strategy 2 -> B-frames<16
-    `-bf 16`
-  ]
-}
diff --git a/shared/ffmpeg/ffmpeg-edition.ts b/shared/ffmpeg/ffmpeg-edition.ts
deleted file mode 100644
index 724ca1ea9..000000000
--- a/shared/ffmpeg/ffmpeg-edition.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { FilterSpecification } from 'fluent-ffmpeg'
-import { FFmpegCommandWrapper, FFmpegCommandWrapperOptions } from './ffmpeg-command-wrapper'
-import { presetVOD } from './shared/presets'
-import { ffprobePromise, getVideoStreamDimensionsInfo, getVideoStreamDuration, getVideoStreamFPS, hasAudioStream } from './ffprobe'
-
-export class FFmpegEdition {
-  private readonly commandWrapper: FFmpegCommandWrapper
-
-  constructor (options: FFmpegCommandWrapperOptions) {
-    this.commandWrapper = new FFmpegCommandWrapper(options)
-  }
-
-  async cutVideo (options: {
-    inputPath: string
-    outputPath: string
-    start?: number
-    end?: number
-  }) {
-    const { inputPath, outputPath } = options
-
-    const mainProbe = await ffprobePromise(inputPath)
-    const fps = await getVideoStreamFPS(inputPath, mainProbe)
-    const { resolution } = await getVideoStreamDimensionsInfo(inputPath, mainProbe)
-
-    const command = this.commandWrapper.buildCommand(inputPath)
-      .output(outputPath)
-
-    await presetVOD({
-      commandWrapper: this.commandWrapper,
-      input: inputPath,
-      resolution,
-      fps,
-      canCopyAudio: false,
-      canCopyVideo: false
-    })
-
-    if (options.start) {
-      command.outputOption('-ss ' + options.start)
-    }
-
-    if (options.end) {
-      command.outputOption('-to ' + options.end)
-    }
-
-    await this.commandWrapper.runCommand()
-  }
-
-  async addWatermark (options: {
-    inputPath: string
-    watermarkPath: string
-    outputPath: string
-
-    videoFilters: {
-      watermarkSizeRatio: number
-      horitonzalMarginRatio: number
-      verticalMarginRatio: number
-    }
-  }) {
-    const { watermarkPath, inputPath, outputPath, videoFilters } = options
-
-    const videoProbe = await ffprobePromise(inputPath)
-    const fps = await getVideoStreamFPS(inputPath, videoProbe)
-    const { resolution } = await getVideoStreamDimensionsInfo(inputPath, videoProbe)
-
-    const command = this.commandWrapper.buildCommand(inputPath)
-      .output(outputPath)
-
-    command.input(watermarkPath)
-
-    await presetVOD({
-      commandWrapper: this.commandWrapper,
-      input: inputPath,
-      resolution,
-      fps,
-      canCopyAudio: true,
-      canCopyVideo: false
-    })
-
-    const complexFilter: FilterSpecification[] = [
-      // Scale watermark
-      {
-        inputs: [ '[1]', '[0]' ],
-        filter: 'scale2ref',
-        options: {
-          w: 'oh*mdar',
-          h: `ih*${videoFilters.watermarkSizeRatio}`
-        },
-        outputs: [ '[watermark]', '[video]' ]
-      },
-
-      {
-        inputs: [ '[video]', '[watermark]' ],
-        filter: 'overlay',
-        options: {
-          x: `main_w - overlay_w - (main_h * ${videoFilters.horitonzalMarginRatio})`,
-          y: `main_h * ${videoFilters.verticalMarginRatio}`
-        }
-      }
-    ]
-
-    command.complexFilter(complexFilter)
-
-    await this.commandWrapper.runCommand()
-  }
-
-  async addIntroOutro (options: {
-    inputPath: string
-    introOutroPath: string
-    outputPath: string
-    type: 'intro' | 'outro'
-  }) {
-    const { introOutroPath, inputPath, outputPath, type } = options
-
-    const mainProbe = await ffprobePromise(inputPath)
-    const fps = await getVideoStreamFPS(inputPath, mainProbe)
-    const { resolution } = await getVideoStreamDimensionsInfo(inputPath, mainProbe)
-    const mainHasAudio = await hasAudioStream(inputPath, mainProbe)
-
-    const introOutroProbe = await ffprobePromise(introOutroPath)
-    const introOutroHasAudio = await hasAudioStream(introOutroPath, introOutroProbe)
-
-    const command = this.commandWrapper.buildCommand(inputPath)
-      .output(outputPath)
-
-    command.input(introOutroPath)
-
-    if (!introOutroHasAudio && mainHasAudio) {
-      const duration = await getVideoStreamDuration(introOutroPath, introOutroProbe)
-
-      command.input('anullsrc')
-      command.withInputFormat('lavfi')
-      command.withInputOption('-t ' + duration)
-    }
-
-    await presetVOD({
-      commandWrapper: this.commandWrapper,
-      input: inputPath,
-      resolution,
-      fps,
-      canCopyAudio: false,
-      canCopyVideo: false
-    })
-
-    // Add black background to correctly scale intro/outro with padding
-    const complexFilter: FilterSpecification[] = [
-      {
-        inputs: [ '1', '0' ],
-        filter: 'scale2ref',
-        options: {
-          w: 'iw',
-          h: `ih`
-        },
-        outputs: [ 'intro-outro', 'main' ]
-      },
-      {
-        inputs: [ 'intro-outro', 'main' ],
-        filter: 'scale2ref',
-        options: {
-          w: 'iw',
-          h: `ih`
-        },
-        outputs: [ 'to-scale', 'main' ]
-      },
-      {
-        inputs: 'to-scale',
-        filter: 'drawbox',
-        options: {
-          t: 'fill'
-        },
-        outputs: [ 'to-scale-bg' ]
-      },
-      {
-        inputs: [ '1', 'to-scale-bg' ],
-        filter: 'scale2ref',
-        options: {
-          w: 'iw',
-          h: 'ih',
-          force_original_aspect_ratio: 'decrease',
-          flags: 'spline'
-        },
-        outputs: [ 'to-scale', 'to-scale-bg' ]
-      },
-      {
-        inputs: [ 'to-scale-bg', 'to-scale' ],
-        filter: 'overlay',
-        options: {
-          x: '(main_w - overlay_w)/2',
-          y: '(main_h - overlay_h)/2'
-        },
-        outputs: 'intro-outro-resized'
-      }
-    ]
-
-    const concatFilter = {
-      inputs: [],
-      filter: 'concat',
-      options: {
-        n: 2,
-        v: 1,
-        unsafe: 1
-      },
-      outputs: [ 'v' ]
-    }
-
-    const introOutroFilterInputs = [ 'intro-outro-resized' ]
-    const mainFilterInputs = [ 'main' ]
-
-    if (mainHasAudio) {
-      mainFilterInputs.push('0:a')
-
-      if (introOutroHasAudio) {
-        introOutroFilterInputs.push('1:a')
-      } else {
-        // Silent input
-        introOutroFilterInputs.push('2:a')
-      }
-    }
-
-    if (type === 'intro') {
-      concatFilter.inputs = [ ...introOutroFilterInputs, ...mainFilterInputs ]
-    } else {
-      concatFilter.inputs = [ ...mainFilterInputs, ...introOutroFilterInputs ]
-    }
-
-    if (mainHasAudio) {
-      concatFilter.options['a'] = 1
-      concatFilter.outputs.push('a')
-
-      command.outputOption('-map [a]')
-    }
-
-    command.outputOption('-map [v]')
-
-    complexFilter.push(concatFilter)
-    command.complexFilter(complexFilter)
-
-    await this.commandWrapper.runCommand()
-  }
-}
diff --git a/shared/ffmpeg/ffmpeg-images.ts b/shared/ffmpeg/ffmpeg-images.ts
deleted file mode 100644
index 618fac7d1..000000000
--- a/shared/ffmpeg/ffmpeg-images.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { FFmpegCommandWrapper, FFmpegCommandWrapperOptions } from './ffmpeg-command-wrapper'
-import { getVideoStreamDuration } from './ffprobe'
-
-export class FFmpegImage {
-  private readonly commandWrapper: FFmpegCommandWrapper
-
-  constructor (options: FFmpegCommandWrapperOptions) {
-    this.commandWrapper = new FFmpegCommandWrapper(options)
-  }
-
-  convertWebPToJPG (options: {
-    path: string
-    destination: string
-  }): Promise<void> {
-    const { path, destination } = options
-
-    this.commandWrapper.buildCommand(path)
-      .output(destination)
-
-    return this.commandWrapper.runCommand({ silent: true })
-  }
-
-  processGIF (options: {
-    path: string
-    destination: string
-    newSize: { width: number, height: number }
-  }): Promise<void> {
-    const { path, destination, newSize } = options
-
-    this.commandWrapper.buildCommand(path)
-      .fps(20)
-      .size(`${newSize.width}x${newSize.height}`)
-      .output(destination)
-
-    return this.commandWrapper.runCommand()
-  }
-
-  async generateThumbnailFromVideo (options: {
-    fromPath: string
-    output: string
-  }) {
-    const { fromPath, output } = options
-
-    let duration = await getVideoStreamDuration(fromPath)
-    if (isNaN(duration)) duration = 0
-
-    this.commandWrapper.buildCommand(fromPath)
-      .seekInput(duration / 2)
-      .videoFilter('thumbnail=500')
-      .outputOption('-frames:v 1')
-      .output(output)
-
-    return this.commandWrapper.runCommand()
-  }
-
-  async generateStoryboardFromVideo (options: {
-    path: string
-    destination: string
-
-    sprites: {
-      size: {
-        width: number
-        height: number
-      }
-
-      count: {
-        width: number
-        height: number
-      }
-
-      duration: number
-    }
-  }) {
-    const { path, destination, sprites } = options
-
-    const command = this.commandWrapper.buildCommand(path)
-
-    const filter = [
-      `setpts=N/round(FRAME_RATE)/TB`,
-      `select='not(mod(t,${options.sprites.duration}))'`,
-      `scale=${sprites.size.width}:${sprites.size.height}`,
-      `tile=layout=${sprites.count.width}x${sprites.count.height}`
-    ].join(',')
-
-    command.outputOption('-filter_complex', filter)
-    command.outputOption('-frames:v', '1')
-    command.outputOption('-q:v', '2')
-    command.output(destination)
-
-    return this.commandWrapper.runCommand()
-  }
-}
diff --git a/shared/ffmpeg/ffmpeg-live.ts b/shared/ffmpeg/ffmpeg-live.ts
deleted file mode 100644
index cca4c6474..000000000
--- a/shared/ffmpeg/ffmpeg-live.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { FilterSpecification } from 'fluent-ffmpeg'
-import { join } from 'path'
-import { pick } from '@shared/core-utils'
-import { FFmpegCommandWrapper, FFmpegCommandWrapperOptions } from './ffmpeg-command-wrapper'
-import { buildStreamSuffix, getScaleFilter, StreamType } from './ffmpeg-utils'
-import { addDefaultEncoderGlobalParams, addDefaultEncoderParams, applyEncoderOptions } from './shared'
-
-export class FFmpegLive {
-  private readonly commandWrapper: FFmpegCommandWrapper
-
-  constructor (options: FFmpegCommandWrapperOptions) {
-    this.commandWrapper = new FFmpegCommandWrapper(options)
-  }
-
-  async getLiveTranscodingCommand (options: {
-    inputUrl: string
-
-    outPath: string
-    masterPlaylistName: string
-
-    toTranscode: {
-      resolution: number
-      fps: number
-    }[]
-
-    // Input information
-    bitrate: number
-    ratio: number
-    hasAudio: boolean
-
-    segmentListSize: number
-    segmentDuration: number
-  }) {
-    const {
-      inputUrl,
-      outPath,
-      toTranscode,
-      bitrate,
-      masterPlaylistName,
-      ratio,
-      hasAudio
-    } = options
-    const command = this.commandWrapper.buildCommand(inputUrl)
-
-    const varStreamMap: string[] = []
-
-    const complexFilter: FilterSpecification[] = [
-      {
-        inputs: '[v:0]',
-        filter: 'split',
-        options: toTranscode.length,
-        outputs: toTranscode.map(t => `vtemp${t.resolution}`)
-      }
-    ]
-
-    command.outputOption('-sc_threshold 0')
-
-    addDefaultEncoderGlobalParams(command)
-
-    for (let i = 0; i < toTranscode.length; i++) {
-      const streamMap: string[] = []
-      const { resolution, fps } = toTranscode[i]
-
-      const baseEncoderBuilderParams = {
-        input: inputUrl,
-
-        canCopyAudio: true,
-        canCopyVideo: true,
-
-        inputBitrate: bitrate,
-        inputRatio: ratio,
-
-        resolution,
-        fps,
-
-        streamNum: i,
-        videoType: 'live' as 'live'
-      }
-
-      {
-        const streamType: StreamType = 'video'
-        const builderResult = await this.commandWrapper.getEncoderBuilderResult({ ...baseEncoderBuilderParams, streamType })
-        if (!builderResult) {
-          throw new Error('No available live video encoder found')
-        }
-
-        command.outputOption(`-map [vout${resolution}]`)
-
-        addDefaultEncoderParams({ command, encoder: builderResult.encoder, fps, streamNum: i })
-
-        this.commandWrapper.debugLog(
-          `Apply ffmpeg live video params from ${builderResult.encoder} using ${this.commandWrapper.getProfile()} profile.`,
-          { builderResult, fps, toTranscode }
-        )
-
-        command.outputOption(`${buildStreamSuffix('-c:v', i)} ${builderResult.encoder}`)
-        applyEncoderOptions(command, builderResult.result)
-
-        complexFilter.push({
-          inputs: `vtemp${resolution}`,
-          filter: getScaleFilter(builderResult.result),
-          options: `w=-2:h=${resolution}`,
-          outputs: `vout${resolution}`
-        })
-
-        streamMap.push(`v:${i}`)
-      }
-
-      if (hasAudio) {
-        const streamType: StreamType = 'audio'
-        const builderResult = await this.commandWrapper.getEncoderBuilderResult({ ...baseEncoderBuilderParams, streamType })
-        if (!builderResult) {
-          throw new Error('No available live audio encoder found')
-        }
-
-        command.outputOption('-map a:0')
-
-        addDefaultEncoderParams({ command, encoder: builderResult.encoder, fps, streamNum: i })
-
-        this.commandWrapper.debugLog(
-          `Apply ffmpeg live audio params from ${builderResult.encoder} using ${this.commandWrapper.getProfile()} profile.`,
-          { builderResult, fps, resolution }
-        )
-
-        command.outputOption(`${buildStreamSuffix('-c:a', i)} ${builderResult.encoder}`)
-        applyEncoderOptions(command, builderResult.result)
-
-        streamMap.push(`a:${i}`)
-      }
-
-      varStreamMap.push(streamMap.join(','))
-    }
-
-    command.complexFilter(complexFilter)
-
-    this.addDefaultLiveHLSParams({ ...pick(options, [ 'segmentDuration', 'segmentListSize' ]), outPath, masterPlaylistName })
-
-    command.outputOption('-var_stream_map', varStreamMap.join(' '))
-
-    return command
-  }
-
-  getLiveMuxingCommand (options: {
-    inputUrl: string
-    outPath: string
-    masterPlaylistName: string
-
-    segmentListSize: number
-    segmentDuration: number
-  }) {
-    const { inputUrl, outPath, masterPlaylistName } = options
-
-    const command = this.commandWrapper.buildCommand(inputUrl)
-
-    command.outputOption('-c:v copy')
-    command.outputOption('-c:a copy')
-    command.outputOption('-map 0:a?')
-    command.outputOption('-map 0:v?')
-
-    this.addDefaultLiveHLSParams({ ...pick(options, [ 'segmentDuration', 'segmentListSize' ]), outPath, masterPlaylistName })
-
-    return command
-  }
-
-  private addDefaultLiveHLSParams (options: {
-    outPath: string
-    masterPlaylistName: string
-    segmentListSize: number
-    segmentDuration: number
-  }) {
-    const { outPath, masterPlaylistName, segmentListSize, segmentDuration } = options
-
-    const command = this.commandWrapper.getCommand()
-
-    command.outputOption('-hls_time ' + segmentDuration)
-    command.outputOption('-hls_list_size ' + segmentListSize)
-    command.outputOption('-hls_flags delete_segments+independent_segments+program_date_time')
-    command.outputOption(`-hls_segment_filename ${join(outPath, '%v-%06d.ts')}`)
-    command.outputOption('-master_pl_name ' + masterPlaylistName)
-    command.outputOption(`-f hls`)
-
-    command.output(join(outPath, '%v.m3u8'))
-  }
-}
diff --git a/shared/ffmpeg/ffmpeg-utils.ts b/shared/ffmpeg/ffmpeg-utils.ts
deleted file mode 100644
index 7d09c32ca..000000000
--- a/shared/ffmpeg/ffmpeg-utils.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { EncoderOptions } from '@shared/models'
-
-export type StreamType = 'audio' | 'video'
-
-export function buildStreamSuffix (base: string, streamNum?: number) {
-  if (streamNum !== undefined) {
-    return `${base}:${streamNum}`
-  }
-
-  return base
-}
-
-export function getScaleFilter (options: EncoderOptions): string {
-  if (options.scaleFilter) return options.scaleFilter.name
-
-  return 'scale'
-}
diff --git a/shared/ffmpeg/ffmpeg-version.ts b/shared/ffmpeg/ffmpeg-version.ts
deleted file mode 100644
index 41d9b2d89..000000000
--- a/shared/ffmpeg/ffmpeg-version.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { exec } from 'child_process'
-import ffmpeg from 'fluent-ffmpeg'
-
-export function getFFmpegVersion () {
-  return new Promise<string>((res, rej) => {
-    (ffmpeg() as any)._getFfmpegPath((err, ffmpegPath) => {
-      if (err) return rej(err)
-      if (!ffmpegPath) return rej(new Error('Could not find ffmpeg path'))
-
-      return exec(`${ffmpegPath} -version`, (err, stdout) => {
-        if (err) return rej(err)
-
-        const parsed = stdout.match(/ffmpeg version .?(\d+\.\d+(\.\d+)?)/)
-        if (!parsed?.[1]) return rej(new Error(`Could not find ffmpeg version in ${stdout}`))
-
-        // Fix ffmpeg version that does not include patch version (4.4 for example)
-        let version = parsed[1]
-        if (version.match(/^\d+\.\d+$/)) {
-          version += '.0'
-        }
-      })
-    })
-  })
-}
diff --git a/shared/ffmpeg/ffmpeg-vod.ts b/shared/ffmpeg/ffmpeg-vod.ts
deleted file mode 100644
index e40ca0a1e..000000000
--- a/shared/ffmpeg/ffmpeg-vod.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import { MutexInterface } from 'async-mutex'
-import { FfmpegCommand } from 'fluent-ffmpeg'
-import { readFile, writeFile } from 'fs-extra'
-import { dirname } from 'path'
-import { pick } from '@shared/core-utils'
-import { VideoResolution } from '@shared/models'
-import { FFmpegCommandWrapper, FFmpegCommandWrapperOptions } from './ffmpeg-command-wrapper'
-import { ffprobePromise, getVideoStreamDimensionsInfo } from './ffprobe'
-import { presetCopy, presetOnlyAudio, presetVOD } from './shared/presets'
-
-export type TranscodeVODOptionsType = 'hls' | 'hls-from-ts' | 'quick-transcode' | 'video' | 'merge-audio' | 'only-audio'
-
-export interface BaseTranscodeVODOptions {
-  type: TranscodeVODOptionsType
-
-  inputPath: string
-  outputPath: string
-
-  // Will be released after the ffmpeg started
-  // To prevent a bug where the input file does not exist anymore when running ffmpeg
-  inputFileMutexReleaser: MutexInterface.Releaser
-
-  resolution: number
-  fps: number
-}
-
-export interface HLSTranscodeOptions extends BaseTranscodeVODOptions {
-  type: 'hls'
-
-  copyCodecs: boolean
-
-  hlsPlaylist: {
-    videoFilename: string
-  }
-}
-
-export interface HLSFromTSTranscodeOptions extends BaseTranscodeVODOptions {
-  type: 'hls-from-ts'
-
-  isAAC: boolean
-
-  hlsPlaylist: {
-    videoFilename: string
-  }
-}
-
-export interface QuickTranscodeOptions extends BaseTranscodeVODOptions {
-  type: 'quick-transcode'
-}
-
-export interface VideoTranscodeOptions extends BaseTranscodeVODOptions {
-  type: 'video'
-}
-
-export interface MergeAudioTranscodeOptions extends BaseTranscodeVODOptions {
-  type: 'merge-audio'
-  audioPath: string
-}
-
-export interface OnlyAudioTranscodeOptions extends BaseTranscodeVODOptions {
-  type: 'only-audio'
-}
-
-export type TranscodeVODOptions =
-  HLSTranscodeOptions
-  | HLSFromTSTranscodeOptions
-  | VideoTranscodeOptions
-  | MergeAudioTranscodeOptions
-  | OnlyAudioTranscodeOptions
-  | QuickTranscodeOptions
-
-// ---------------------------------------------------------------------------
-
-export class FFmpegVOD {
-  private readonly commandWrapper: FFmpegCommandWrapper
-
-  private ended = false
-
-  constructor (options: FFmpegCommandWrapperOptions) {
-    this.commandWrapper = new FFmpegCommandWrapper(options)
-  }
-
-  async transcode (options: TranscodeVODOptions) {
-    const builders: {
-      [ type in TranscodeVODOptionsType ]: (options: TranscodeVODOptions) => Promise<void> | void
-    } = {
-      'quick-transcode': this.buildQuickTranscodeCommand.bind(this),
-      'hls': this.buildHLSVODCommand.bind(this),
-      'hls-from-ts': this.buildHLSVODFromTSCommand.bind(this),
-      'merge-audio': this.buildAudioMergeCommand.bind(this),
-      // TODO: remove, we merge this in buildWebVideoCommand
-      'only-audio': this.buildOnlyAudioCommand.bind(this),
-      'video': this.buildWebVideoCommand.bind(this)
-    }
-
-    this.commandWrapper.debugLog('Will run transcode.', { options })
-
-    const command = this.commandWrapper.buildCommand(options.inputPath)
-      .output(options.outputPath)
-
-    await builders[options.type](options)
-
-    command.on('start', () => {
-      setTimeout(() => {
-        options.inputFileMutexReleaser()
-      }, 1000)
-    })
-
-    await this.commandWrapper.runCommand()
-
-    await this.fixHLSPlaylistIfNeeded(options)
-
-    this.ended = true
-  }
-
-  isEnded () {
-    return this.ended
-  }
-
-  private async buildWebVideoCommand (options: TranscodeVODOptions) {
-    const { resolution, fps, inputPath } = options
-
-    if (resolution === VideoResolution.H_NOVIDEO) {
-      presetOnlyAudio(this.commandWrapper)
-      return
-    }
-
-    let scaleFilterValue: string
-
-    if (resolution !== undefined) {
-      const probe = await ffprobePromise(inputPath)
-      const videoStreamInfo = await getVideoStreamDimensionsInfo(inputPath, probe)
-
-      scaleFilterValue = videoStreamInfo?.isPortraitMode === true
-        ? `w=${resolution}:h=-2`
-        : `w=-2:h=${resolution}`
-    }
-
-    await presetVOD({
-      commandWrapper: this.commandWrapper,
-
-      resolution,
-      input: inputPath,
-      canCopyAudio: true,
-      canCopyVideo: true,
-      fps,
-      scaleFilterValue
-    })
-  }
-
-  private buildQuickTranscodeCommand (_options: TranscodeVODOptions) {
-    const command = this.commandWrapper.getCommand()
-
-    presetCopy(this.commandWrapper)
-
-    command.outputOption('-map_metadata -1') // strip all metadata
-      .outputOption('-movflags faststart')
-  }
-
-  // ---------------------------------------------------------------------------
-  // Audio transcoding
-  // ---------------------------------------------------------------------------
-
-  private async buildAudioMergeCommand (options: MergeAudioTranscodeOptions) {
-    const command = this.commandWrapper.getCommand()
-
-    command.loop(undefined)
-
-    await presetVOD({
-      ...pick(options, [ 'resolution' ]),
-
-      commandWrapper: this.commandWrapper,
-      input: options.audioPath,
-      canCopyAudio: true,
-      canCopyVideo: true,
-      fps: options.fps,
-      scaleFilterValue: this.getMergeAudioScaleFilterValue()
-    })
-
-    command.outputOption('-preset:v veryfast')
-
-    command.input(options.audioPath)
-      .outputOption('-tune stillimage')
-      .outputOption('-shortest')
-  }
-
-  private buildOnlyAudioCommand (_options: OnlyAudioTranscodeOptions) {
-    presetOnlyAudio(this.commandWrapper)
-  }
-
-  // Avoid "height not divisible by 2" error
-  private getMergeAudioScaleFilterValue () {
-    return 'trunc(iw/2)*2:trunc(ih/2)*2'
-  }
-
-  // ---------------------------------------------------------------------------
-  // HLS transcoding
-  // ---------------------------------------------------------------------------
-
-  private async buildHLSVODCommand (options: HLSTranscodeOptions) {
-    const command = this.commandWrapper.getCommand()
-
-    const videoPath = this.getHLSVideoPath(options)
-
-    if (options.copyCodecs) presetCopy(this.commandWrapper)
-    else if (options.resolution === VideoResolution.H_NOVIDEO) presetOnlyAudio(this.commandWrapper)
-    else await this.buildWebVideoCommand(options)
-
-    this.addCommonHLSVODCommandOptions(command, videoPath)
-  }
-
-  private buildHLSVODFromTSCommand (options: HLSFromTSTranscodeOptions) {
-    const command = this.commandWrapper.getCommand()
-
-    const videoPath = this.getHLSVideoPath(options)
-
-    command.outputOption('-c copy')
-
-    if (options.isAAC) {
-      // Required for example when copying an AAC stream from an MPEG-TS
-      // Since it's a bitstream filter, we don't need to reencode the audio
-      command.outputOption('-bsf:a aac_adtstoasc')
-    }
-
-    this.addCommonHLSVODCommandOptions(command, videoPath)
-  }
-
-  private addCommonHLSVODCommandOptions (command: FfmpegCommand, outputPath: string) {
-    return command.outputOption('-hls_time 4')
-                  .outputOption('-hls_list_size 0')
-                  .outputOption('-hls_playlist_type vod')
-                  .outputOption('-hls_segment_filename ' + outputPath)
-                  .outputOption('-hls_segment_type fmp4')
-                  .outputOption('-f hls')
-                  .outputOption('-hls_flags single_file')
-  }
-
-  private async fixHLSPlaylistIfNeeded (options: TranscodeVODOptions) {
-    if (options.type !== 'hls' && options.type !== 'hls-from-ts') return
-
-    const fileContent = await readFile(options.outputPath)
-
-    const videoFileName = options.hlsPlaylist.videoFilename
-    const videoFilePath = this.getHLSVideoPath(options)
-
-    // Fix wrong mapping with some ffmpeg versions
-    const newContent = fileContent.toString()
-                                  .replace(`#EXT-X-MAP:URI="${videoFilePath}",`, `#EXT-X-MAP:URI="${videoFileName}",`)
-
-    await writeFile(options.outputPath, newContent)
-  }
-
-  private getHLSVideoPath (options: HLSTranscodeOptions | HLSFromTSTranscodeOptions) {
-    return `${dirname(options.outputPath)}/${options.hlsPlaylist.videoFilename}`
-  }
-}
diff --git a/shared/ffmpeg/ffprobe.ts b/shared/ffmpeg/ffprobe.ts
deleted file mode 100644
index fda08c28e..000000000
--- a/shared/ffmpeg/ffprobe.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { ffprobe, FfprobeData } from 'fluent-ffmpeg'
-import { forceNumber } from '@shared/core-utils'
-import { VideoResolution } from '@shared/models/videos'
-
-/**
- *
- * Helpers to run ffprobe and extract data from the JSON output
- *
- */
-
-function ffprobePromise (path: string) {
-  return new Promise<FfprobeData>((res, rej) => {
-    ffprobe(path, (err, data) => {
-      if (err) return rej(err)
-
-      return res(data)
-    })
-  })
-}
-
-// ---------------------------------------------------------------------------
-// Audio
-// ---------------------------------------------------------------------------
-
-const imageCodecs = new Set([
-  'ansi', 'apng', 'bintext', 'bmp', 'brender_pix', 'dpx', 'exr', 'fits', 'gem', 'gif', 'jpeg2000', 'jpgls', 'mjpeg', 'mjpegb', 'msp2',
-  'pam', 'pbm', 'pcx', 'pfm', 'pgm', 'pgmyuv', 'pgx', 'photocd', 'pictor', 'png', 'ppm', 'psd', 'sgi', 'sunrast', 'svg', 'targa', 'tiff',
-  'txd', 'webp', 'xbin', 'xbm', 'xface', 'xpm', 'xwd'
-])
-
-async function isAudioFile (path: string, existingProbe?: FfprobeData) {
-  const videoStream = await getVideoStream(path, existingProbe)
-  if (!videoStream) return true
-
-  if (imageCodecs.has(videoStream.codec_name)) return true
-
-  return false
-}
-
-async function hasAudioStream (path: string, existingProbe?: FfprobeData) {
-  const { audioStream } = await getAudioStream(path, existingProbe)
-
-  return !!audioStream
-}
-
-async function getAudioStream (videoPath: string, existingProbe?: FfprobeData) {
-  // without position, ffprobe considers the last input only
-  // we make it consider the first input only
-  // if you pass a file path to pos, then ffprobe acts on that file directly
-  const data = existingProbe || await ffprobePromise(videoPath)
-
-  if (Array.isArray(data.streams)) {
-    const audioStream = data.streams.find(stream => stream['codec_type'] === 'audio')
-
-    if (audioStream) {
-      return {
-        absolutePath: data.format.filename,
-        audioStream,
-        bitrate: forceNumber(audioStream['bit_rate'])
-      }
-    }
-  }
-
-  return { absolutePath: data.format.filename }
-}
-
-function getMaxAudioBitrate (type: 'aac' | 'mp3' | string, bitrate: number) {
-  const maxKBitrate = 384
-  const kToBits = (kbits: number) => kbits * 1000
-
-  // If we did not manage to get the bitrate, use an average value
-  if (!bitrate) return 256
-
-  if (type === 'aac') {
-    switch (true) {
-      case bitrate > kToBits(maxKBitrate):
-        return maxKBitrate
-
-      default:
-        return -1 // we interpret it as a signal to copy the audio stream as is
-    }
-  }
-
-  /*
-    a 192kbit/sec mp3 doesn't hold as much information as a 192kbit/sec aac.
-    That's why, when using aac, we can go to lower kbit/sec. The equivalences
-    made here are not made to be accurate, especially with good mp3 encoders.
-    */
-  switch (true) {
-    case bitrate <= kToBits(192):
-      return 128
-
-    case bitrate <= kToBits(384):
-      return 256
-
-    default:
-      return maxKBitrate
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Video
-// ---------------------------------------------------------------------------
-
-async function getVideoStreamDimensionsInfo (path: string, existingProbe?: FfprobeData) {
-  const videoStream = await getVideoStream(path, existingProbe)
-  if (!videoStream) {
-    return {
-      width: 0,
-      height: 0,
-      ratio: 0,
-      resolution: VideoResolution.H_NOVIDEO,
-      isPortraitMode: false
-    }
-  }
-
-  return {
-    width: videoStream.width,
-    height: videoStream.height,
-    ratio: Math.max(videoStream.height, videoStream.width) / Math.min(videoStream.height, videoStream.width),
-    resolution: Math.min(videoStream.height, videoStream.width),
-    isPortraitMode: videoStream.height > videoStream.width
-  }
-}
-
-async function getVideoStreamFPS (path: string, existingProbe?: FfprobeData) {
-  const videoStream = await getVideoStream(path, existingProbe)
-  if (!videoStream) return 0
-
-  for (const key of [ 'avg_frame_rate', 'r_frame_rate' ]) {
-    const valuesText: string = videoStream[key]
-    if (!valuesText) continue
-
-    const [ frames, seconds ] = valuesText.split('/')
-    if (!frames || !seconds) continue
-
-    const result = parseInt(frames, 10) / parseInt(seconds, 10)
-    if (result > 0) return Math.round(result)
-  }
-
-  return 0
-}
-
-async function getVideoStreamBitrate (path: string, existingProbe?: FfprobeData): Promise<number> {
-  const metadata = existingProbe || await ffprobePromise(path)
-
-  let bitrate = metadata.format.bit_rate
-  if (bitrate && !isNaN(bitrate)) return bitrate
-
-  const videoStream = await getVideoStream(path, existingProbe)
-  if (!videoStream) return undefined
-
-  bitrate = forceNumber(videoStream?.bit_rate)
-  if (bitrate && !isNaN(bitrate)) return bitrate
-
-  return undefined
-}
-
-async function getVideoStreamDuration (path: string, existingProbe?: FfprobeData) {
-  const metadata = existingProbe || await ffprobePromise(path)
-
-  return Math.round(metadata.format.duration)
-}
-
-async function getVideoStream (path: string, existingProbe?: FfprobeData) {
-  const metadata = existingProbe || await ffprobePromise(path)
-
-  return metadata.streams.find(s => s.codec_type === 'video')
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  getVideoStreamDimensionsInfo,
-  getMaxAudioBitrate,
-  getVideoStream,
-  getVideoStreamDuration,
-  getAudioStream,
-  getVideoStreamFPS,
-  isAudioFile,
-  ffprobePromise,
-  getVideoStreamBitrate,
-  hasAudioStream
-}
diff --git a/shared/ffmpeg/index.ts b/shared/ffmpeg/index.ts
deleted file mode 100644
index 1dab292da..000000000
--- a/shared/ffmpeg/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export * from './ffmpeg-command-wrapper'
-export * from './ffmpeg-default-transcoding-profile'
-export * from './ffmpeg-edition'
-export * from './ffmpeg-images'
-export * from './ffmpeg-live'
-export * from './ffmpeg-utils'
-export * from './ffmpeg-version'
-export * from './ffmpeg-vod'
-export * from './ffprobe'
diff --git a/shared/ffmpeg/shared/encoder-options.ts b/shared/ffmpeg/shared/encoder-options.ts
deleted file mode 100644
index 9692a6b02..000000000
--- a/shared/ffmpeg/shared/encoder-options.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { FfmpegCommand } from 'fluent-ffmpeg'
-import { EncoderOptions } from '@shared/models'
-import { buildStreamSuffix } from '../ffmpeg-utils'
-
-export function addDefaultEncoderGlobalParams (command: FfmpegCommand) {
-  // avoid issues when transcoding some files: https://trac.ffmpeg.org/ticket/6375
-  command.outputOption('-max_muxing_queue_size 1024')
-         // strip all metadata
-         .outputOption('-map_metadata -1')
-         // allows import of source material with incompatible pixel formats (e.g. MJPEG video)
-         .outputOption('-pix_fmt yuv420p')
-}
-
-export function addDefaultEncoderParams (options: {
-  command: FfmpegCommand
-  encoder: 'libx264' | string
-  fps: number
-
-  streamNum?: number
-}) {
-  const { command, encoder, fps, streamNum } = options
-
-  if (encoder === 'libx264') {
-    // 3.1 is the minimal resource allocation for our highest supported resolution
-    command.outputOption(buildStreamSuffix('-level:v', streamNum) + ' 3.1')
-
-    if (fps) {
-      // Keyframe interval of 2 seconds for faster seeking and resolution switching.
-      // https://streaminglearningcenter.com/blogs/whats-the-right-keyframe-interval.html
-      // https://superuser.com/a/908325
-      command.outputOption(buildStreamSuffix('-g:v', streamNum) + ' ' + (fps * 2))
-    }
-  }
-}
-
-export function applyEncoderOptions (command: FfmpegCommand, options: EncoderOptions) {
-  command.inputOptions(options.inputOptions ?? [])
-    .outputOptions(options.outputOptions ?? [])
-}
diff --git a/shared/ffmpeg/shared/index.ts b/shared/ffmpeg/shared/index.ts
deleted file mode 100644
index 51de0316f..000000000
--- a/shared/ffmpeg/shared/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './encoder-options'
-export * from './presets'
diff --git a/shared/ffmpeg/shared/presets.ts b/shared/ffmpeg/shared/presets.ts
deleted file mode 100644
index dcebdc1cf..000000000
--- a/shared/ffmpeg/shared/presets.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { pick } from '@shared/core-utils'
-import { FFmpegCommandWrapper } from '../ffmpeg-command-wrapper'
-import { ffprobePromise, getVideoStreamBitrate, getVideoStreamDimensionsInfo, hasAudioStream } from '../ffprobe'
-import { addDefaultEncoderGlobalParams, addDefaultEncoderParams, applyEncoderOptions } from './encoder-options'
-import { getScaleFilter, StreamType } from '../ffmpeg-utils'
-
-export async function presetVOD (options: {
-  commandWrapper: FFmpegCommandWrapper
-
-  input: string
-
-  canCopyAudio: boolean
-  canCopyVideo: boolean
-
-  resolution: number
-  fps: number
-
-  scaleFilterValue?: string
-}) {
-  const { commandWrapper, input, resolution, fps, scaleFilterValue } = options
-  const command = commandWrapper.getCommand()
-
-  command.format('mp4')
-    .outputOption('-movflags faststart')
-
-  addDefaultEncoderGlobalParams(command)
-
-  const probe = await ffprobePromise(input)
-
-  // Audio encoder
-  const bitrate = await getVideoStreamBitrate(input, probe)
-  const videoStreamDimensions = await getVideoStreamDimensionsInfo(input, probe)
-
-  let streamsToProcess: StreamType[] = [ 'audio', 'video' ]
-
-  if (!await hasAudioStream(input, probe)) {
-    command.noAudio()
-    streamsToProcess = [ 'video' ]
-  }
-
-  for (const streamType of streamsToProcess) {
-    const builderResult = await commandWrapper.getEncoderBuilderResult({
-      ...pick(options, [ 'canCopyAudio', 'canCopyVideo' ]),
-
-      input,
-      inputBitrate: bitrate,
-      inputRatio: videoStreamDimensions?.ratio || 0,
-
-      resolution,
-      fps,
-      streamType,
-
-      videoType: 'vod' as 'vod'
-    })
-
-    if (!builderResult) {
-      throw new Error('No available encoder found for stream ' + streamType)
-    }
-
-    commandWrapper.debugLog(
-      `Apply ffmpeg params from ${builderResult.encoder} for ${streamType} ` +
-      `stream of input ${input} using ${commandWrapper.getProfile()} profile.`,
-      { builderResult, resolution, fps }
-    )
-
-    if (streamType === 'video') {
-      command.videoCodec(builderResult.encoder)
-
-      if (scaleFilterValue) {
-        command.outputOption(`-vf ${getScaleFilter(builderResult.result)}=${scaleFilterValue}`)
-      }
-    } else if (streamType === 'audio') {
-      command.audioCodec(builderResult.encoder)
-    }
-
-    applyEncoderOptions(command, builderResult.result)
-    addDefaultEncoderParams({ command, encoder: builderResult.encoder, fps })
-  }
-}
-
-export function presetCopy (commandWrapper: FFmpegCommandWrapper) {
-  commandWrapper.getCommand()
-    .format('mp4')
-    .videoCodec('copy')
-    .audioCodec('copy')
-}
-
-export function presetOnlyAudio (commandWrapper: FFmpegCommandWrapper) {
-  commandWrapper.getCommand()
-    .format('mp4')
-    .audioCodec('copy')
-    .noVideo()
-}
diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts
deleted file mode 100644
index 10cf53ead..000000000
--- a/shared/models/activitypub/activity.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { ActivityPubActor } from './activitypub-actor'
-import { ActivityPubSignature } from './activitypub-signature'
-import {
-  ActivityFlagReasonObject,
-  ActivityObject,
-  APObjectId,
-  CacheFileObject,
-  PlaylistObject,
-  VideoCommentObject,
-  VideoObject,
-  WatchActionObject
-} from './objects'
-
-export type ActivityUpdateObject =
-  Extract<ActivityObject, VideoObject | CacheFileObject | PlaylistObject | ActivityPubActor | string> | ActivityPubActor
-
-// Cannot Extract from Activity because of circular reference
-export type ActivityUndoObject =
-  ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate<CacheFileObject | string> | ActivityAnnounce
-
-export type ActivityCreateObject =
-  Extract<ActivityObject, VideoObject | CacheFileObject | WatchActionObject | VideoCommentObject | PlaylistObject | string>
-
-export type Activity =
-  ActivityCreate<ActivityCreateObject> |
-  ActivityUpdate<ActivityUpdateObject> |
-  ActivityDelete |
-  ActivityFollow |
-  ActivityAccept |
-  ActivityAnnounce |
-  ActivityUndo<ActivityUndoObject> |
-  ActivityLike |
-  ActivityReject |
-  ActivityView |
-  ActivityDislike |
-  ActivityFlag
-
-export type ActivityType =
-  'Create' |
-  'Update' |
-  'Delete' |
-  'Follow' |
-  'Accept' |
-  'Announce' |
-  'Undo' |
-  'Like' |
-  'Reject' |
-  'View' |
-  'Dislike' |
-  'Flag'
-
-export interface ActivityAudience {
-  to: string[]
-  cc: string[]
-}
-
-export interface BaseActivity {
-  '@context'?: any[]
-  id: string
-  to?: string[]
-  cc?: string[]
-  actor: string | ActivityPubActor
-  type: ActivityType
-  signature?: ActivityPubSignature
-}
-
-export interface ActivityCreate <T extends ActivityCreateObject> extends BaseActivity {
-  type: 'Create'
-  object: T
-}
-
-export interface ActivityUpdate <T extends ActivityUpdateObject> extends BaseActivity {
-  type: 'Update'
-  object: T
-}
-
-export interface ActivityDelete extends BaseActivity {
-  type: 'Delete'
-  object: APObjectId
-}
-
-export interface ActivityFollow extends BaseActivity {
-  type: 'Follow'
-  object: string
-}
-
-export interface ActivityAccept extends BaseActivity {
-  type: 'Accept'
-  object: ActivityFollow
-}
-
-export interface ActivityReject extends BaseActivity {
-  type: 'Reject'
-  object: ActivityFollow
-}
-
-export interface ActivityAnnounce extends BaseActivity {
-  type: 'Announce'
-  object: APObjectId
-}
-
-export interface ActivityUndo <T extends ActivityUndoObject> extends BaseActivity {
-  type: 'Undo'
-  object: T
-}
-
-export interface ActivityLike extends BaseActivity {
-  type: 'Like'
-  object: APObjectId
-}
-
-export interface ActivityView extends BaseActivity {
-  type: 'View'
-  actor: string
-  object: APObjectId
-
-  // If sending a "viewer" event
-  expires?: string
-}
-
-export interface ActivityDislike extends BaseActivity {
-  id: string
-  type: 'Dislike'
-  actor: string
-  object: APObjectId
-}
-
-export interface ActivityFlag extends BaseActivity {
-  type: 'Flag'
-  content: string
-  object: APObjectId | APObjectId[]
-  tag?: ActivityFlagReasonObject[]
-  startAt?: number
-  endAt?: number
-}
diff --git a/shared/models/activitypub/activitypub-actor.ts b/shared/models/activitypub/activitypub-actor.ts
deleted file mode 100644
index b86bcb764..000000000
--- a/shared/models/activitypub/activitypub-actor.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { ActivityIconObject, ActivityPubAttributedTo } from './objects/common-objects'
-
-export type ActivityPubActorType = 'Person' | 'Application' | 'Group' | 'Service' | 'Organization'
-
-export interface ActivityPubActor {
-  '@context': any[]
-  type: ActivityPubActorType
-  id: string
-  following: string
-  followers: string
-  playlists?: string
-  inbox: string
-  outbox: string
-  preferredUsername: string
-  url: string
-  name: string
-  endpoints: {
-    sharedInbox: string
-  }
-  summary: string
-  attributedTo: ActivityPubAttributedTo[]
-
-  support?: string
-  publicKey: {
-    id: string
-    owner: string
-    publicKeyPem: string
-  }
-
-  image?: ActivityIconObject | ActivityIconObject[]
-  icon?: ActivityIconObject | ActivityIconObject[]
-
-  published?: string
-}
diff --git a/shared/models/activitypub/activitypub-collection.ts b/shared/models/activitypub/activitypub-collection.ts
deleted file mode 100644
index 60a6a6b04..000000000
--- a/shared/models/activitypub/activitypub-collection.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Activity } from './activity'
-
-export interface ActivityPubCollection {
-  '@context': string[]
-  type: 'Collection' | 'CollectionPage'
-  totalItems: number
-  partOf?: string
-  items: Activity[]
-}
diff --git a/shared/models/activitypub/activitypub-ordered-collection.ts b/shared/models/activitypub/activitypub-ordered-collection.ts
deleted file mode 100644
index 3de0890bb..000000000
--- a/shared/models/activitypub/activitypub-ordered-collection.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export interface ActivityPubOrderedCollection<T> {
-  '@context': string[]
-  type: 'OrderedCollection' | 'OrderedCollectionPage'
-  totalItems: number
-  orderedItems: T[]
-
-  partOf?: string
-  next?: string
-  first?: string
-}
diff --git a/shared/models/activitypub/activitypub-root.ts b/shared/models/activitypub/activitypub-root.ts
deleted file mode 100644
index 22dff83a2..000000000
--- a/shared/models/activitypub/activitypub-root.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Activity } from './activity'
-import { ActivityPubCollection } from './activitypub-collection'
-import { ActivityPubOrderedCollection } from './activitypub-ordered-collection'
-
-export type RootActivity = Activity | ActivityPubCollection | ActivityPubOrderedCollection<Activity>
diff --git a/shared/models/activitypub/activitypub-signature.ts b/shared/models/activitypub/activitypub-signature.ts
deleted file mode 100644
index fafdc246d..000000000
--- a/shared/models/activitypub/activitypub-signature.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface ActivityPubSignature {
-  type: string
-  created: Date
-  creator: string
-  signatureValue: string
-}
diff --git a/shared/models/activitypub/context.ts b/shared/models/activitypub/context.ts
deleted file mode 100644
index e9df38207..000000000
--- a/shared/models/activitypub/context.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export type ContextType =
-  'Video' |
-  'Comment' |
-  'Playlist' |
-  'Follow' |
-  'Reject' |
-  'Accept' |
-  'View' |
-  'Announce' |
-  'CacheFile' |
-  'Delete' |
-  'Rate' |
-  'Flag' |
-  'Actor' |
-  'Collection' |
-  'WatchAction'
diff --git a/shared/models/activitypub/index.ts b/shared/models/activitypub/index.ts
deleted file mode 100644
index fa07b6a64..000000000
--- a/shared/models/activitypub/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export * from './objects'
-export * from './activity'
-export * from './activitypub-actor'
-export * from './activitypub-collection'
-export * from './activitypub-ordered-collection'
-export * from './activitypub-root'
-export * from './activitypub-signature'
-export * from './context'
-export * from './webfinger'
diff --git a/shared/models/activitypub/objects/abuse-object.ts b/shared/models/activitypub/objects/abuse-object.ts
deleted file mode 100644
index d938b8693..000000000
--- a/shared/models/activitypub/objects/abuse-object.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ActivityFlagReasonObject } from './common-objects'
-
-export interface AbuseObject {
-  type: 'Flag'
-
-  content: string
-  mediaType: 'text/markdown'
-
-  object: string | string[]
-
-  tag?: ActivityFlagReasonObject[]
-
-  startAt?: number
-  endAt?: number
-}
diff --git a/shared/models/activitypub/objects/activitypub-object.ts b/shared/models/activitypub/objects/activitypub-object.ts
deleted file mode 100644
index faeac2618..000000000
--- a/shared/models/activitypub/objects/activitypub-object.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { AbuseObject } from './abuse-object'
-import { CacheFileObject } from './cache-file-object'
-import { PlaylistObject } from './playlist-object'
-import { VideoCommentObject } from './video-comment-object'
-import { VideoObject } from './video-object'
-import { WatchActionObject } from './watch-action-object'
-
-export type ActivityObject =
-  VideoObject |
-  AbuseObject |
-  VideoCommentObject |
-  CacheFileObject |
-  PlaylistObject |
-  WatchActionObject |
-  string
-
-export type APObjectId = string | { id: string }
diff --git a/shared/models/activitypub/objects/cache-file-object.ts b/shared/models/activitypub/objects/cache-file-object.ts
deleted file mode 100644
index 19a817582..000000000
--- a/shared/models/activitypub/objects/cache-file-object.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ActivityVideoUrlObject, ActivityPlaylistUrlObject } from './common-objects'
-
-export interface CacheFileObject {
-  id: string
-  type: 'CacheFile'
-  object: string
-  expires: string
-  url: ActivityVideoUrlObject | ActivityPlaylistUrlObject
-}
diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts
deleted file mode 100644
index db9c73658..000000000
--- a/shared/models/activitypub/objects/common-objects.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { AbusePredefinedReasonsString } from '../../moderation/abuse/abuse-reason.model'
-
-export interface ActivityIdentifierObject {
-  identifier: string
-  name: string
-  url?: string
-}
-
-export interface ActivityIconObject {
-  type: 'Image'
-  url: string
-  mediaType: string
-  width?: number
-  height?: number
-}
-
-export type ActivityVideoUrlObject = {
-  type: 'Link'
-  mediaType: 'video/mp4' | 'video/webm' | 'video/ogg'
-  href: string
-  height: number
-  size: number
-  fps: number
-}
-
-export type ActivityPlaylistSegmentHashesObject = {
-  type: 'Link'
-  name: 'sha256'
-  mediaType: 'application/json'
-  href: string
-}
-
-export type ActivityVideoFileMetadataUrlObject = {
-  type: 'Link'
-  rel: [ 'metadata', any ]
-  mediaType: 'application/json'
-  height: number
-  href: string
-  fps: number
-}
-
-export type ActivityTrackerUrlObject = {
-  type: 'Link'
-  rel: [ 'tracker', 'websocket' | 'http' ]
-  name: string
-  href: string
-}
-
-export type ActivityStreamingPlaylistInfohashesObject = {
-  type: 'Infohash'
-  name: string
-}
-
-export type ActivityPlaylistUrlObject = {
-  type: 'Link'
-  mediaType: 'application/x-mpegURL'
-  href: string
-  tag?: ActivityTagObject[]
-}
-
-export type ActivityBitTorrentUrlObject = {
-  type: 'Link'
-  mediaType: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet'
-  href: string
-  height: number
-}
-
-export type ActivityMagnetUrlObject = {
-  type: 'Link'
-  mediaType: 'application/x-bittorrent;x-scheme-handler/magnet'
-  href: string
-  height: number
-}
-
-export type ActivityHtmlUrlObject = {
-  type: 'Link'
-  mediaType: 'text/html'
-  href: string
-}
-
-export interface ActivityHashTagObject {
-  type: 'Hashtag'
-  href?: string
-  name: string
-}
-
-export interface ActivityMentionObject {
-  type: 'Mention'
-  href?: string
-  name: string
-}
-
-export interface ActivityFlagReasonObject {
-  type: 'Hashtag'
-  name: AbusePredefinedReasonsString
-}
-
-export type ActivityTagObject =
-  ActivityPlaylistSegmentHashesObject
-  | ActivityStreamingPlaylistInfohashesObject
-  | ActivityVideoUrlObject
-  | ActivityHashTagObject
-  | ActivityMentionObject
-  | ActivityBitTorrentUrlObject
-  | ActivityMagnetUrlObject
-  | ActivityVideoFileMetadataUrlObject
-
-export type ActivityUrlObject =
-  ActivityVideoUrlObject
-  | ActivityPlaylistUrlObject
-  | ActivityBitTorrentUrlObject
-  | ActivityMagnetUrlObject
-  | ActivityHtmlUrlObject
-  | ActivityVideoFileMetadataUrlObject
-  | ActivityTrackerUrlObject
-
-export type ActivityPubAttributedTo = { type: 'Group' | 'Person', id: string } | string
-
-export interface ActivityTombstoneObject {
-  '@context'?: any
-  id: string
-  url?: string
-  type: 'Tombstone'
-  name?: string
-  formerType?: string
-  inReplyTo?: string
-  published: string
-  updated: string
-  deleted: string
-}
diff --git a/shared/models/activitypub/objects/index.ts b/shared/models/activitypub/objects/index.ts
deleted file mode 100644
index 753e02003..000000000
--- a/shared/models/activitypub/objects/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export * from './abuse-object'
-export * from './activitypub-object'
-export * from './cache-file-object'
-export * from './common-objects'
-export * from './playlist-element-object'
-export * from './playlist-object'
-export * from './video-comment-object'
-export * from './video-object'
-export * from './watch-action-object'
diff --git a/shared/models/activitypub/objects/playlist-element-object.ts b/shared/models/activitypub/objects/playlist-element-object.ts
deleted file mode 100644
index b85e4fe19..000000000
--- a/shared/models/activitypub/objects/playlist-element-object.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export interface PlaylistElementObject {
-  id: string
-  type: 'PlaylistElement'
-
-  url: string
-  position: number
-
-  startTimestamp?: number
-  stopTimestamp?: number
-}
diff --git a/shared/models/activitypub/objects/playlist-object.ts b/shared/models/activitypub/objects/playlist-object.ts
deleted file mode 100644
index 0ccb71828..000000000
--- a/shared/models/activitypub/objects/playlist-object.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ActivityIconObject, ActivityPubAttributedTo } from './common-objects'
-
-export interface PlaylistObject {
-  id: string
-  type: 'Playlist'
-
-  name: string
-
-  content: string
-  mediaType: 'text/markdown'
-
-  uuid: string
-
-  totalItems: number
-  attributedTo: ActivityPubAttributedTo[]
-
-  icon?: ActivityIconObject
-
-  published: string
-  updated: string
-
-  orderedItems?: string[]
-
-  partOf?: string
-  next?: string
-  first?: string
-
-  to?: string[]
-}
diff --git a/shared/models/activitypub/objects/video-comment-object.ts b/shared/models/activitypub/objects/video-comment-object.ts
deleted file mode 100644
index fb1e6f8db..000000000
--- a/shared/models/activitypub/objects/video-comment-object.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ActivityPubAttributedTo, ActivityTagObject } from './common-objects'
-
-export interface VideoCommentObject {
-  type: 'Note'
-  id: string
-
-  content: string
-  mediaType: 'text/markdown'
-
-  inReplyTo: string
-  published: string
-  updated: string
-  url: string
-  attributedTo: ActivityPubAttributedTo
-  tag: ActivityTagObject[]
-}
diff --git a/shared/models/activitypub/objects/video-object.ts b/shared/models/activitypub/objects/video-object.ts
deleted file mode 100644
index 409504f0f..000000000
--- a/shared/models/activitypub/objects/video-object.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import {
-  ActivityIconObject,
-  ActivityIdentifierObject,
-  ActivityPubAttributedTo,
-  ActivityTagObject,
-  ActivityUrlObject
-} from './common-objects'
-import { LiveVideoLatencyMode, VideoState } from '../../videos'
-
-export interface VideoObject {
-  type: 'Video'
-  id: string
-  name: string
-  duration: string
-  uuid: string
-  tag: ActivityTagObject[]
-  category: ActivityIdentifierObject
-  licence: ActivityIdentifierObject
-  language: ActivityIdentifierObject
-  subtitleLanguage: ActivityIdentifierObject[]
-  views: number
-
-  sensitive: boolean
-
-  isLiveBroadcast: boolean
-  liveSaveReplay: boolean
-  permanentLive: boolean
-  latencyMode: LiveVideoLatencyMode
-
-  commentsEnabled: boolean
-  downloadEnabled: boolean
-  waitTranscoding: boolean
-  state: VideoState
-
-  published: string
-  originallyPublishedAt: string
-  updated: string
-  uploadDate: string
-
-  mediaType: 'text/markdown'
-  content: string
-
-  support: string
-
-  icon: ActivityIconObject[]
-
-  url: ActivityUrlObject[]
-
-  likes: string
-  dislikes: string
-  shares: string
-  comments: string
-
-  attributedTo: ActivityPubAttributedTo[]
-
-  preview?: ActivityPubStoryboard[]
-
-  to?: string[]
-  cc?: string[]
-}
-
-export interface ActivityPubStoryboard {
-  type: 'Image'
-  rel: [ 'storyboard' ]
-  url: {
-    href: string
-    mediaType: string
-    width: number
-    height: number
-    tileWidth: number
-    tileHeight: number
-    tileDuration: string
-  }[]
-}
diff --git a/shared/models/activitypub/objects/watch-action-object.ts b/shared/models/activitypub/objects/watch-action-object.ts
deleted file mode 100644
index ed336602f..000000000
--- a/shared/models/activitypub/objects/watch-action-object.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export interface WatchActionObject {
-  id: string
-  type: 'WatchAction'
-
-  startTime: string
-  endTime: string
-
-  location?: {
-    addressCountry: string
-  }
-
-  uuid: string
-  object: string
-  actionStatus: 'CompletedActionStatus'
-
-  duration: string
-
-  watchSections: {
-    startTimestamp: number
-    endTimestamp: number
-  }[]
-}
diff --git a/shared/models/activitypub/webfinger.ts b/shared/models/activitypub/webfinger.ts
deleted file mode 100644
index b94baf996..000000000
--- a/shared/models/activitypub/webfinger.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export interface WebFingerData {
-  subject: string
-  aliases: string[]
-  links: {
-    rel: 'self'
-    type: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
-    href: string
-  }[]
-}
diff --git a/shared/models/actors/account.model.ts b/shared/models/actors/account.model.ts
deleted file mode 100644
index 9fbec60ba..000000000
--- a/shared/models/actors/account.model.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ActorImage } from './actor-image.model'
-import { Actor } from './actor.model'
-
-export interface Account extends Actor {
-  displayName: string
-  description: string
-  avatars: ActorImage[]
-
-  updatedAt: Date | string
-
-  userId?: number
-}
-
-export interface AccountSummary {
-  id: number
-  name: string
-  displayName: string
-  url: string
-  host: string
-
-  avatars: ActorImage[]
-}
diff --git a/shared/models/actors/actor-image.model.ts b/shared/models/actors/actor-image.model.ts
deleted file mode 100644
index cfe44ac15..000000000
--- a/shared/models/actors/actor-image.model.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export interface ActorImage {
-  width: number
-  path: string
-
-  url?: string
-
-  createdAt: Date | string
-  updatedAt: Date | string
-}
diff --git a/shared/models/actors/actor-image.type.ts b/shared/models/actors/actor-image.type.ts
deleted file mode 100644
index ac8eb6bf2..000000000
--- a/shared/models/actors/actor-image.type.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const enum ActorImageType {
-  AVATAR = 1,
-  BANNER = 2
-}
diff --git a/shared/models/actors/actor.model.ts b/shared/models/actors/actor.model.ts
deleted file mode 100644
index ab0760263..000000000
--- a/shared/models/actors/actor.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ActorImage } from './actor-image.model'
-
-export interface Actor {
-  id: number
-  url: string
-  name: string
-  host: string
-  followingCount: number
-  followersCount: number
-  createdAt: Date | string
-
-  avatars: ActorImage[]
-}
diff --git a/shared/models/actors/custom-page.model.ts b/shared/models/actors/custom-page.model.ts
deleted file mode 100644
index 1e33584c1..000000000
--- a/shared/models/actors/custom-page.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface CustomPage {
-  content: string
-}
diff --git a/shared/models/actors/follow.model.ts b/shared/models/actors/follow.model.ts
deleted file mode 100644
index 244d6d97e..000000000
--- a/shared/models/actors/follow.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Actor } from './actor.model'
-
-export type FollowState = 'pending' | 'accepted' | 'rejected'
-
-export interface ActorFollow {
-  id: number
-  follower: Actor & { hostRedundancyAllowed: boolean }
-  following: Actor & { hostRedundancyAllowed: boolean }
-  score: number
-  state: FollowState
-  createdAt: Date
-  updatedAt: Date
-}
diff --git a/shared/models/actors/index.ts b/shared/models/actors/index.ts
deleted file mode 100644
index e03f168cd..000000000
--- a/shared/models/actors/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './account.model'
-export * from './actor-image.model'
-export * from './actor-image.type'
-export * from './actor.model'
-export * from './custom-page.model'
-export * from './follow.model'
diff --git a/shared/models/bulk/bulk-remove-comments-of-body.model.ts b/shared/models/bulk/bulk-remove-comments-of-body.model.ts
deleted file mode 100644
index 31e018c2a..000000000
--- a/shared/models/bulk/bulk-remove-comments-of-body.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface BulkRemoveCommentsOfBody {
-  accountName: string
-  scope: 'my-videos' | 'instance'
-}
diff --git a/shared/models/bulk/index.ts b/shared/models/bulk/index.ts
deleted file mode 100644
index 168c8cd48..000000000
--- a/shared/models/bulk/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './bulk-remove-comments-of-body.model'
diff --git a/shared/models/common/index.ts b/shared/models/common/index.ts
deleted file mode 100644
index 4db85eff2..000000000
--- a/shared/models/common/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './result-list.model'
diff --git a/shared/models/common/result-list.model.ts b/shared/models/common/result-list.model.ts
deleted file mode 100644
index fcafcfb2f..000000000
--- a/shared/models/common/result-list.model.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface ResultList<T> {
-  total: number
-  data: T[]
-}
-
-export interface ThreadsResultList <T> extends ResultList <T> {
-  totalNotDeletedComments: number
-}
diff --git a/shared/models/custom-markup/custom-markup-data.model.ts b/shared/models/custom-markup/custom-markup-data.model.ts
deleted file mode 100644
index 3e396052a..000000000
--- a/shared/models/custom-markup/custom-markup-data.model.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-export type EmbedMarkupData = {
-  // Video or playlist uuid
-  uuid: string
-}
-
-export type VideoMiniatureMarkupData = {
-  // Video uuid
-  uuid: string
-
-  onlyDisplayTitle?: string // boolean
-}
-
-export type PlaylistMiniatureMarkupData = {
-  // Playlist uuid
-  uuid: string
-}
-
-export type ChannelMiniatureMarkupData = {
-  // Channel name (username)
-  name: string
-
-  displayLatestVideo?: string // boolean
-  displayDescription?: string // boolean
-}
-
-export type VideosListMarkupData = {
-  onlyDisplayTitle?: string // boolean
-  maxRows?: string // number
-
-  sort?: string
-  count?: string // number
-
-  categoryOneOf?: string // coma separated values, number[]
-  languageOneOf?: string // coma separated values
-
-  channelHandle?: string
-  accountHandle?: string
-
-  isLive?: string // number
-
-  onlyLocal?: string // boolean
-}
-
-export type ButtonMarkupData = {
-  theme: 'primary' | 'secondary'
-  href: string
-  label: string
-  blankTarget?: string // boolean
-}
-
-export type ContainerMarkupData = {
-  width?: string
-  title?: string
-  description?: string
-  layout?: 'row' | 'column'
-
-  justifyContent?: 'space-between' | 'normal' // default to 'space-between'
-}
diff --git a/shared/models/custom-markup/index.ts b/shared/models/custom-markup/index.ts
deleted file mode 100644
index 2898dfa90..000000000
--- a/shared/models/custom-markup/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './custom-markup-data.model'
diff --git a/shared/models/feeds/feed-format.enum.ts b/shared/models/feeds/feed-format.enum.ts
deleted file mode 100644
index d3d574331..000000000
--- a/shared/models/feeds/feed-format.enum.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const enum FeedFormat {
-  RSS = 'xml',
-  ATOM = 'atom',
-  JSON = 'json'
-}
diff --git a/shared/models/feeds/index.ts b/shared/models/feeds/index.ts
deleted file mode 100644
index d56c8458c..000000000
--- a/shared/models/feeds/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './feed-format.enum'
diff --git a/shared/models/http/http-error-codes.ts b/shared/models/http/http-error-codes.ts
deleted file mode 100644
index 5ebff1cb5..000000000
--- a/shared/models/http/http-error-codes.ts
+++ /dev/null
@@ -1,364 +0,0 @@
-/**
- * Hypertext Transfer Protocol (HTTP) response status codes.
- * @see {@link https://en.wikipedia.org/wiki/List_of_HTTP_status_codes}
- *
- * WebDAV and other codes useless with regards to PeerTube are not listed.
- */
-export const enum HttpStatusCode {
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.2.1
-   *
-   * The server has received the request headers and the client should proceed to send the request body
-   * (in the case of a request for which a body needs to be sent; for example, a POST request).
-   * Sending a large request body to a server after a request has been rejected for inappropriate headers would be inefficient.
-   * To have a server check the request's headers, a client must send Expect: 100-continue as a header in its initial request
-   * and receive a 100 Continue status code in response before sending the body. The response 417 Expectation Failed indicates
-   * the request should not be continued.
-   */
-  CONTINUE_100 = 100,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.2.2
-   *
-   * This code is sent in response to an Upgrade request header by the client, and indicates the protocol the server is switching too.
-   */
-  SWITCHING_PROTOCOLS_101 = 101,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.3.1
-   *
-   * Standard response for successful HTTP requests. The actual response will depend on the request method used:
-   * GET: The resource has been fetched and is transmitted in the message body.
-   * HEAD: The entity headers are in the message body.
-   * POST: The resource describing the result of the action is transmitted in the message body.
-   * TRACE: The message body contains the request message as received by the server
-   */
-  OK_200 = 200,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.3.2
-   *
-   * The request has been fulfilled, resulting in the creation of a new resource, typically after a PUT.
-   */
-  CREATED_201 = 201,
-
-  /**
-   * The request has been accepted for processing, but the processing has not been completed.
-   * The request might or might not be eventually acted upon, and may be disallowed when processing occurs.
-   */
-  ACCEPTED_202 = 202,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.3.5
-   *
-   * There is no content to send for this request, but the headers may be useful.
-   * The user-agent may update its cached headers for this resource with the new ones.
-   */
-  NO_CONTENT_204 = 204,
-
-  /**
-   * The server successfully processed the request, but is not returning any content.
-   * Unlike a 204 response, this response requires that the requester reset the document view.
-   */
-  RESET_CONTENT_205 = 205,
-
-  /**
-   * The server is delivering only part of the resource (byte serving) due to a range header sent by the client.
-   * The range header is used by HTTP clients to enable resuming of interrupted downloads,
-   * or split a download into multiple simultaneous streams.
-   */
-  PARTIAL_CONTENT_206 = 206,
-
-  /**
-   * Indicates multiple options for the resource from which the client may choose (via agent-driven content negotiation).
-   * For example, this code could be used to present multiple video format options,
-   * to list files with different filename extensions, or to suggest word-sense disambiguation.
-   */
-  MULTIPLE_CHOICES_300 = 300,
-
-  /**
-   * This and all future requests should be directed to the given URI.
-   */
-  MOVED_PERMANENTLY_301 = 301,
-
-  /**
-   * This is an example of industry practice contradicting the standard.
-   * The HTTP/1.0 specification (RFC 1945) required the client to perform a temporary redirect
-   * (the original describing phrase was "Moved Temporarily"), but popular browsers implemented 302
-   * with the functionality of a 303 See Other. Therefore, HTTP/1.1 added status codes 303 and 307
-   * to distinguish between the two behaviours. However, some Web applications and frameworks
-   * use the 302 status code as if it were the 303.
-   */
-  FOUND_302 = 302,
-
-  /**
-   * SINCE HTTP/1.1
-   * The response to the request can be found under another URI using a GET method.
-   * When received in response to a POST (or PUT/DELETE), the client should presume that
-   * the server has received the data and should issue a redirect with a separate GET message.
-   */
-  SEE_OTHER_303 = 303,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7232#section-4.1
-   *
-   * Indicates that the resource has not been modified since the version specified by the request headers
-   * `If-Modified-Since` or `If-None-Match`.
-   * In such case, there is no need to retransmit the resource since the client still has a previously-downloaded copy.
-   */
-  NOT_MODIFIED_304 = 304,
-
-  /**
-   * SINCE HTTP/1.1
-   * In this case, the request should be repeated with another URI; however, future requests should still use the original URI.
-   * In contrast to how 302 was historically implemented, the request method is not allowed to be changed when reissuing the
-   * original request.
-   * For example, a POST request should be repeated using another POST request.
-   */
-  TEMPORARY_REDIRECT_307 = 307,
-
-  /**
-   * The request and all future requests should be repeated using another URI.
-   * 307 and 308 parallel the behaviors of 302 and 301, but do not allow the HTTP method to change.
-   * So, for example, submitting a form to a permanently redirected resource may continue smoothly.
-   */
-  PERMANENT_REDIRECT_308 = 308,
-
-  /**
-   * The server cannot or will not process the request due to an apparent client error
-   * (e.g., malformed request syntax, too large size, invalid request message framing, or deceptive request routing).
-   */
-  BAD_REQUEST_400 = 400,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7235#section-3.1
-   *
-   * Similar to 403 Forbidden, but specifically for use when authentication is required and has failed or has not yet
-   * been provided. The response must include a `WWW-Authenticate` header field containing a challenge applicable to the
-   * requested resource. See Basic access authentication and Digest access authentication. 401 semantically means
-   * "unauthenticated",i.e. the user does not have the necessary credentials.
-   */
-  UNAUTHORIZED_401 = 401,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.5.2
-   *
-   * Reserved for future use. The original intention was that this code might be used as part of some form of digital
-   * cash or micro payment scheme, but that has not happened, and this code is not usually used.
-   * Google Developers API uses this status if a particular developer has exceeded the daily limit on requests.
-   */
-  PAYMENT_REQUIRED_402 = 402,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.5.3
-   *
-   * The client does not have access rights to the content, i.e. they are unauthorized, so server is rejecting to
-   * give proper response. Unlike 401, the client's identity is known to the server.
-   */
-  FORBIDDEN_403 = 403,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.6.2
-   *
-   * The requested resource could not be found but may be available in the future.
-   * Subsequent requests by the client are permissible.
-   */
-  NOT_FOUND_404 = 404,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.5.5
-   *
-   * A request method is not supported for the requested resource;
-   * for example, a GET request on a form that requires data to be presented via POST, or a PUT request on a read-only resource.
-   */
-  METHOD_NOT_ALLOWED_405 = 405,
-
-  /**
-   * The requested resource is capable of generating only content not acceptable according to the Accept headers sent in the request.
-   */
-  NOT_ACCEPTABLE_406 = 406,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.5.7
-   *
-   * This response is sent on an idle connection by some servers, even without any previous request by the client.
-   * It means that the server would like to shut down this unused connection. This response is used much more since
-   * some browsers, like Chrome, Firefox 27+, or IE9, use HTTP pre-connection mechanisms to speed up surfing. Also
-   * note that some servers merely shut down the connection without sending this message.
-   *
-   * @
-   */
-  REQUEST_TIMEOUT_408 = 408,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.5.8
-   *
-   * Indicates that the request could not be processed because of conflict in the request,
-   * such as an edit conflict between multiple simultaneous updates.
-   *
-   * @see HttpStatusCode.UNPROCESSABLE_ENTITY_422 to denote a disabled feature
-   */
-  CONFLICT_409 = 409,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.5.9
-   *
-   * Indicates that the resource requested is no longer available and will not be available again.
-   * This should be used when a resource has been intentionally removed and the resource should be purged.
-   * Upon receiving a 410 status code, the client should not request the resource in the future.
-   * Clients such as search engines should remove the resource from their indices.
-   * Most use cases do not require clients and search engines to purge the resource, and a "404 Not Found" may be used instead.
-   */
-  GONE_410 = 410,
-
-  /**
-   * The request did not specify the length of its content, which is required by the requested resource.
-   */
-  LENGTH_REQUIRED_411 = 411,
-
-  /**
-   * The server does not meet one of the preconditions that the requester put on the request.
-   */
-  PRECONDITION_FAILED_412 = 412,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.5.11
-   *
-   * The request is larger than the server is willing or able to process ; the server might close the connection
-   * or return an Retry-After header field.
-   * Previously called "Request Entity Too Large".
-   */
-  PAYLOAD_TOO_LARGE_413 = 413,
-
-  /**
-   * The URI provided was too long for the server to process. Often the result of too much data being encoded as a
-   * query-string of a GET request, in which case it should be converted to a POST request.
-   * Called "Request-URI Too Long" previously.
-   */
-  URI_TOO_LONG_414 = 414,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.5.13
-   *
-   * The request entity has a media type which the server or resource does not support.
-   * For example, the client uploads an image as image/svg+xml, but the server requires that images use a different format.
-   */
-  UNSUPPORTED_MEDIA_TYPE_415 = 415,
-
-  /**
-   * The client has asked for a portion of the file (byte serving), but the server cannot supply that portion.
-   * For example, if the client asked for a part of the file that lies beyond the end of the file.
-   * Called "Requested Range Not Satisfiable" previously.
-   */
-  RANGE_NOT_SATISFIABLE_416 = 416,
-
-  /**
-   * The server cannot meet the requirements of the `Expect` request-header field.
-   */
-  EXPECTATION_FAILED_417 = 417,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc2324
-   *
-   * This code was defined in 1998 as one of the traditional IETF April Fools' jokes, in RFC 2324, Hyper Text Coffee Pot Control Protocol,
-   * and is not expected to be implemented by actual HTTP servers. The RFC specifies this code should be returned by
-   * teapots requested to brew coffee. This HTTP status is used as an Easter egg in some websites, including PeerTube instances ;-).
-   */
-  I_AM_A_TEAPOT_418 = 418,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc2518#section-10.3
-   *
-   * The request was well-formed but was unable to be followed due to semantic errors.
-   * The server understands the content type of the request entity (hence a 415 (Unsupported Media Type) status code is inappropriate),
-   * and the syntax of the request entity is correct (thus a 400 (Bad Request) status code is inappropriate) but was unable to process
-   * the contained instructions. For example, this error condition may occur if an JSON request body contains well-formed (i.e.,
-   * syntactically correct), but semantically erroneous, JSON instructions.
-   *
-   * Can also be used to denote disabled features (akin to disabled syntax).
-   *
-   * @see HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415 if the `Content-Type` was not supported.
-   * @see HttpStatusCode.BAD_REQUEST_400 if the request was not parsable (broken JSON, XML)
-   */
-  UNPROCESSABLE_ENTITY_422 = 422,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc4918#section-11.3
-   *
-   * The resource that is being accessed is locked. WebDAV-specific but used by some HTTP services.
-   *
-   * @deprecated use `If-Match` / `If-None-Match` instead
-   * @see {@link https://evertpot.com/http/423-locked}
-   */
-  LOCKED_423 = 423,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc6585#section-4
-   *
-   * The user has sent too many requests in a given amount of time. Intended for use with rate-limiting schemes.
-   */
-  TOO_MANY_REQUESTS_429 = 429,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc6585#section-5
-   *
-   * The server is unwilling to process the request because either an individual header field,
-   * or all the header fields collectively, are too large.
-   */
-  REQUEST_HEADER_FIELDS_TOO_LARGE_431 = 431,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7725
-   *
-   * A server operator has received a legal demand to deny access to a resource or to a set of resources
-   * that includes the requested resource. The code 451 was chosen as a reference to the novel Fahrenheit 451.
-   */
-  UNAVAILABLE_FOR_LEGAL_REASONS_451 = 451,
-
-  /**
-   * A generic error message, given when an unexpected condition was encountered and no more specific message is suitable.
-   */
-  INTERNAL_SERVER_ERROR_500 = 500,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.6.2
-   *
-   * The server either does not recognize the request method, or it lacks the ability to fulfill the request.
-   * Usually this implies future availability (e.g., a new feature of a web-service API).
-   */
-  NOT_IMPLEMENTED_501 = 501,
-
-  /**
-   * The server was acting as a gateway or proxy and received an invalid response from the upstream server.
-   */
-  BAD_GATEWAY_502 = 502,
-
-  /**
-   * The server is currently unavailable (because it is overloaded or down for maintenance).
-   * Generally, this is a temporary state.
-   */
-  SERVICE_UNAVAILABLE_503 = 503,
-
-  /**
-   * The server was acting as a gateway or proxy and did not receive a timely response from the upstream server.
-   */
-  GATEWAY_TIMEOUT_504 = 504,
-
-  /**
-   * The server does not support the HTTP protocol version used in the request
-   */
-  HTTP_VERSION_NOT_SUPPORTED_505 = 505,
-
-  /**
-   * Official Documentation @ https://tools.ietf.org/html/rfc2518#section-10.6
-   *
-   * The 507 (Insufficient Storage) status code means the method could not be performed on the resource because the
-   * server is unable to store the representation needed to successfully complete the request. This condition is
-   * considered to be temporary. If the request which received this status code was the result of a user action,
-   * the request MUST NOT be repeated until it is requested by a separate user action.
-   *
-   * @see HttpStatusCode.PAYLOAD_TOO_LARGE_413 for quota errors
-   */
-  INSUFFICIENT_STORAGE_507 = 507,
-}
diff --git a/shared/models/http/http-methods.ts b/shared/models/http/http-methods.ts
deleted file mode 100644
index 3f4adafe2..000000000
--- a/shared/models/http/http-methods.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/** HTTP request method to indicate the desired action to be performed for a given resource. */
-export const enum HttpMethod {
-  /** The CONNECT method establishes a tunnel to the server identified by the target resource. */
-  CONNECT = 'CONNECT',
-  /** The DELETE method deletes the specified resource. */
-  DELETE = 'DELETE',
-  /** The GET method requests a representation of the specified resource. Requests using GET should only retrieve data. */
-  GET = 'GET',
-  /** The HEAD method asks for a response identical to that of a GET request, but without the response body. */
-  HEAD = 'HEAD',
-  /** The OPTIONS method is used to describe the communication options for the target resource. */
-  OPTIONS = 'OPTIONS',
-  /** The PATCH method is used to apply partial modifications to a resource. */
-  PATCH = 'PATCH',
-  /** The POST method is used to submit an entity to the specified resource */
-  POST = 'POST',
-  /** The PUT method replaces all current representations of the target resource with the request payload. */
-  PUT = 'PUT',
-  /** The TRACE method performs a message loop-back test along the path to the target resource. */
-  TRACE = 'TRACE'
-}
diff --git a/shared/models/http/index.ts b/shared/models/http/index.ts
deleted file mode 100644
index ec991afe0..000000000
--- a/shared/models/http/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './http-error-codes'
-export * from './http-methods'
diff --git a/shared/models/index.ts b/shared/models/index.ts
deleted file mode 100644
index 78f6e73e3..000000000
--- a/shared/models/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export * from './activitypub'
-export * from './actors'
-export * from './bulk'
-export * from './common'
-export * from './custom-markup'
-export * from './feeds'
-export * from './http'
-export * from './joinpeertube'
-export * from './metrics'
-export * from './moderation'
-export * from './overviews'
-export * from './plugins'
-export * from './redundancy'
-export * from './runners'
-export * from './search'
-export * from './server'
-export * from './tokens'
-export * from './users'
-export * from './videos'
diff --git a/shared/models/joinpeertube/index.ts b/shared/models/joinpeertube/index.ts
deleted file mode 100644
index 9681c35ad..000000000
--- a/shared/models/joinpeertube/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './versions.model'
diff --git a/shared/models/joinpeertube/versions.model.ts b/shared/models/joinpeertube/versions.model.ts
deleted file mode 100644
index 60a769150..000000000
--- a/shared/models/joinpeertube/versions.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface JoinPeerTubeVersions {
-  peertube: {
-    latestVersion: string
-  }
-}
diff --git a/shared/models/metrics/index.ts b/shared/models/metrics/index.ts
deleted file mode 100644
index 24194cce3..000000000
--- a/shared/models/metrics/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './playback-metric-create.model'
diff --git a/shared/models/metrics/playback-metric-create.model.ts b/shared/models/metrics/playback-metric-create.model.ts
deleted file mode 100644
index 1d47421c3..000000000
--- a/shared/models/metrics/playback-metric-create.model.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { VideoResolution } from '../videos'
-
-export interface PlaybackMetricCreate {
-  playerMode: 'p2p-media-loader' | 'webtorrent' | 'web-video' // FIXME: remove webtorrent player mode not used anymore in PeerTube v6
-
-  resolution?: VideoResolution
-  fps?: number
-
-  p2pEnabled: boolean
-  p2pPeers?: number
-
-  resolutionChanges: number
-
-  errors: number
-
-  downloadedBytesP2P: number
-  downloadedBytesHTTP: number
-
-  uploadedBytesP2P: number
-
-  videoId: number | string
-}
diff --git a/shared/models/moderation/abuse/abuse-create.model.ts b/shared/models/moderation/abuse/abuse-create.model.ts
deleted file mode 100644
index 7d35555c3..000000000
--- a/shared/models/moderation/abuse/abuse-create.model.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { AbusePredefinedReasonsString } from './abuse-reason.model'
-
-export interface AbuseCreate {
-  reason: string
-
-  predefinedReasons?: AbusePredefinedReasonsString[]
-
-  account?: {
-    id: number
-  }
-
-  video?: {
-    id: number | string
-    startAt?: number
-    endAt?: number
-  }
-
-  comment?: {
-    id: number
-  }
-}
diff --git a/shared/models/moderation/abuse/abuse-filter.type.ts b/shared/models/moderation/abuse/abuse-filter.type.ts
deleted file mode 100644
index 7dafc6d77..000000000
--- a/shared/models/moderation/abuse/abuse-filter.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type AbuseFilter = 'video' | 'comment' | 'account'
diff --git a/shared/models/moderation/abuse/abuse-message.model.ts b/shared/models/moderation/abuse/abuse-message.model.ts
deleted file mode 100644
index 9edd9daff..000000000
--- a/shared/models/moderation/abuse/abuse-message.model.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { AccountSummary } from '../../actors/account.model'
-
-export interface AbuseMessage {
-  id: number
-  message: string
-  byModerator: boolean
-  createdAt: Date | string
-
-  account: AccountSummary
-}
diff --git a/shared/models/moderation/abuse/abuse-reason.model.ts b/shared/models/moderation/abuse/abuse-reason.model.ts
deleted file mode 100644
index 57359aef6..000000000
--- a/shared/models/moderation/abuse/abuse-reason.model.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export const enum AbusePredefinedReasons {
-  VIOLENT_OR_REPULSIVE = 1,
-  HATEFUL_OR_ABUSIVE,
-  SPAM_OR_MISLEADING,
-  PRIVACY,
-  RIGHTS,
-  SERVER_RULES,
-  THUMBNAILS,
-  CAPTIONS
-}
-
-export type AbusePredefinedReasonsString =
-  'violentOrRepulsive' |
-  'hatefulOrAbusive' |
-  'spamOrMisleading' |
-  'privacy' |
-  'rights' |
-  'serverRules' |
-  'thumbnails' |
-  'captions'
diff --git a/shared/models/moderation/abuse/abuse-state.model.ts b/shared/models/moderation/abuse/abuse-state.model.ts
deleted file mode 100644
index 8ef6fdada..000000000
--- a/shared/models/moderation/abuse/abuse-state.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const enum AbuseState {
-  PENDING = 1,
-  REJECTED = 2,
-  ACCEPTED = 3
-}
diff --git a/shared/models/moderation/abuse/abuse-update.model.ts b/shared/models/moderation/abuse/abuse-update.model.ts
deleted file mode 100644
index 4360fe7ac..000000000
--- a/shared/models/moderation/abuse/abuse-update.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { AbuseState } from './abuse-state.model'
-
-export interface AbuseUpdate {
-  moderationComment?: string
-
-  state?: AbuseState
-}
diff --git a/shared/models/moderation/abuse/abuse-video-is.type.ts b/shared/models/moderation/abuse/abuse-video-is.type.ts
deleted file mode 100644
index 74937f3b9..000000000
--- a/shared/models/moderation/abuse/abuse-video-is.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type AbuseVideoIs = 'deleted' | 'blacklisted'
diff --git a/shared/models/moderation/abuse/abuse.model.ts b/shared/models/moderation/abuse/abuse.model.ts
deleted file mode 100644
index 6048777ff..000000000
--- a/shared/models/moderation/abuse/abuse.model.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Account } from '../../actors/account.model'
-import { AbuseState } from './abuse-state.model'
-import { AbusePredefinedReasonsString } from './abuse-reason.model'
-import { VideoConstant } from '../../videos/video-constant.model'
-import { VideoChannel } from '../../videos/channel/video-channel.model'
-
-export interface AdminVideoAbuse {
-  id: number
-  name: string
-  uuid: string
-  nsfw: boolean
-
-  deleted: boolean
-  blacklisted: boolean
-
-  startAt: number | null
-  endAt: number | null
-
-  thumbnailPath?: string
-  channel?: VideoChannel
-
-  countReports: number
-  nthReport: number
-}
-
-export interface AdminVideoCommentAbuse {
-  id: number
-  threadId: number
-
-  video: {
-    id: number
-    name: string
-    uuid: string
-  }
-
-  text: string
-
-  deleted: boolean
-}
-
-export interface AdminAbuse {
-  id: number
-
-  reason: string
-  predefinedReasons?: AbusePredefinedReasonsString[]
-
-  reporterAccount: Account
-  flaggedAccount: Account
-
-  state: VideoConstant<AbuseState>
-  moderationComment?: string
-
-  video?: AdminVideoAbuse
-  comment?: AdminVideoCommentAbuse
-
-  createdAt: Date
-  updatedAt: Date
-
-  countReportsForReporter?: number
-  countReportsForReportee?: number
-
-  countMessages: number
-}
-
-export type UserVideoAbuse = Omit<AdminVideoAbuse, 'countReports' | 'nthReport'>
-
-export type UserVideoCommentAbuse = AdminVideoCommentAbuse
-
-export type UserAbuse = Omit<AdminAbuse, 'reporterAccount' | 'countReportsForReportee' | 'countReportsForReporter' | 'startAt' | 'endAt'
-| 'count' | 'nth' | 'moderationComment'>
diff --git a/shared/models/moderation/abuse/index.ts b/shared/models/moderation/abuse/index.ts
deleted file mode 100644
index b518517a6..000000000
--- a/shared/models/moderation/abuse/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './abuse-create.model'
-export * from './abuse-filter.type'
-export * from './abuse-message.model'
-export * from './abuse-reason.model'
-export * from './abuse-state.model'
-export * from './abuse-update.model'
-export * from './abuse-video-is.type'
-export * from './abuse.model'
diff --git a/shared/models/moderation/account-block.model.ts b/shared/models/moderation/account-block.model.ts
deleted file mode 100644
index a942ed614..000000000
--- a/shared/models/moderation/account-block.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Account } from '../actors'
-
-export interface AccountBlock {
-  byAccount: Account
-  blockedAccount: Account
-  createdAt: Date | string
-}
diff --git a/shared/models/moderation/block-status.model.ts b/shared/models/moderation/block-status.model.ts
deleted file mode 100644
index 597312757..000000000
--- a/shared/models/moderation/block-status.model.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export interface BlockStatus {
-  accounts: {
-    [ handle: string ]: {
-      blockedByServer: boolean
-      blockedByUser?: boolean
-    }
-  }
-
-  hosts: {
-    [ host: string ]: {
-      blockedByServer: boolean
-      blockedByUser?: boolean
-    }
-  }
-}
diff --git a/shared/models/moderation/index.ts b/shared/models/moderation/index.ts
deleted file mode 100644
index f8e6d351c..000000000
--- a/shared/models/moderation/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './abuse'
-export * from './block-status.model'
-export * from './account-block.model'
-export * from './server-block.model'
diff --git a/shared/models/moderation/server-block.model.ts b/shared/models/moderation/server-block.model.ts
deleted file mode 100644
index a8b8af0b7..000000000
--- a/shared/models/moderation/server-block.model.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Account } from '../actors'
-
-export interface ServerBlock {
-  byAccount: Account
-  blockedServer: {
-    host: string
-  }
-  createdAt: Date | string
-}
diff --git a/shared/models/nodeinfo/index.ts b/shared/models/nodeinfo/index.ts
deleted file mode 100644
index faa64302a..000000000
--- a/shared/models/nodeinfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './nodeinfo.model'
diff --git a/shared/models/nodeinfo/nodeinfo.model.ts b/shared/models/nodeinfo/nodeinfo.model.ts
deleted file mode 100644
index 336cb66d2..000000000
--- a/shared/models/nodeinfo/nodeinfo.model.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * NodeInfo schema version 2.0.
- */
-export interface HttpNodeinfoDiasporaSoftwareNsSchema20 {
-  /**
-   * The schema version, must be 2.0.
-   */
-  version: '2.0'
-  /**
-   * Metadata about server software in use.
-   */
-  software: {
-    /**
-     * The canonical name of this server software.
-     */
-    name: string
-    /**
-     * The version of this server software.
-     */
-    version: string
-  }
-  /**
-   * The protocols supported on this server.
-   */
-  protocols: (
-    | 'activitypub'
-    | 'buddycloud'
-    | 'dfrn'
-    | 'diaspora'
-    | 'libertree'
-    | 'ostatus'
-    | 'pumpio'
-    | 'tent'
-    | 'xmpp'
-    | 'zot')[]
-  /**
-   * The third party sites this server can connect to via their application API.
-   */
-  services: {
-    /**
-     * The third party sites this server can retrieve messages from for combined display with regular traffic.
-     */
-    inbound: ('atom1.0' | 'gnusocial' | 'imap' | 'pnut' | 'pop3' | 'pumpio' | 'rss2.0' | 'twitter')[]
-    /**
-     * The third party sites this server can publish messages to on the behalf of a user.
-     */
-    outbound: (
-      | 'atom1.0'
-      | 'blogger'
-      | 'buddycloud'
-      | 'diaspora'
-      | 'dreamwidth'
-      | 'drupal'
-      | 'facebook'
-      | 'friendica'
-      | 'gnusocial'
-      | 'google'
-      | 'insanejournal'
-      | 'libertree'
-      | 'linkedin'
-      | 'livejournal'
-      | 'mediagoblin'
-      | 'myspace'
-      | 'pinterest'
-      | 'pnut'
-      | 'posterous'
-      | 'pumpio'
-      | 'redmatrix'
-      | 'rss2.0'
-      | 'smtp'
-      | 'tent'
-      | 'tumblr'
-      | 'twitter'
-      | 'wordpress'
-      | 'xmpp')[]
-  }
-  /**
-   * Whether this server allows open self-registration.
-   */
-  openRegistrations: boolean
-  /**
-   * Usage statistics for this server.
-   */
-  usage: {
-    /**
-     * statistics about the users of this server.
-     */
-    users: {
-      /**
-       * The total amount of on this server registered users.
-       */
-      total?: number
-      /**
-       * The amount of users that signed in at least once in the last 180 days.
-       */
-      activeHalfyear?: number
-      /**
-       * The amount of users that signed in at least once in the last 30 days.
-       */
-      activeMonth?: number
-    }
-    /**
-     * The amount of posts that were made by users that are registered on this server.
-     */
-    localPosts?: number
-    /**
-     * The amount of comments that were made by users that are registered on this server.
-     */
-    localComments?: number
-  }
-  /**
-   * Free form key value pairs for software specific values. Clients should not rely on any specific key present.
-   */
-  metadata: {
-    [k: string]: any
-  }
-}
diff --git a/shared/models/overviews/index.ts b/shared/models/overviews/index.ts
deleted file mode 100644
index 468507c6b..000000000
--- a/shared/models/overviews/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './videos-overview.model'
diff --git a/shared/models/overviews/videos-overview.model.ts b/shared/models/overviews/videos-overview.model.ts
deleted file mode 100644
index 0f3cb4a52..000000000
--- a/shared/models/overviews/videos-overview.model.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Video, VideoChannelSummary, VideoConstant } from '../videos'
-
-export interface ChannelOverview {
-  channel: VideoChannelSummary
-  videos: Video[]
-}
-
-export interface CategoryOverview {
-  category: VideoConstant<number>
-  videos: Video[]
-}
-
-export interface TagOverview {
-  tag: string
-  videos: Video[]
-}
-
-export interface VideosOverview {
-  channels: ChannelOverview[]
-
-  categories: CategoryOverview[]
-
-  tags: TagOverview[]
-}
diff --git a/shared/models/plugins/client/client-hook.model.ts b/shared/models/plugins/client/client-hook.model.ts
deleted file mode 100644
index 4a0818c99..000000000
--- a/shared/models/plugins/client/client-hook.model.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-// Data from API hooks: {hookType}:api.{location}.{elementType}.{actionType}.{target}
-// Data in internal functions: {hookType}:{location}.{elementType}.{actionType}.{target}
-
-export const clientFilterHookObject = {
-  // Filter params/result of the function that fetch videos of the trending page
-  'filter:api.trending-videos.videos.list.params': true,
-  'filter:api.trending-videos.videos.list.result': true,
-
-  // Filter params/result of the function that fetch videos of the trending page
-  'filter:api.most-liked-videos.videos.list.params': true,
-  'filter:api.most-liked-videos.videos.list.result': true,
-
-  // Filter params/result of the function that fetch videos of the local page
-  'filter:api.local-videos.videos.list.params': true,
-  'filter:api.local-videos.videos.list.result': true,
-
-  // Filter params/result of the function that fetch videos of the recently-added page
-  'filter:api.recently-added-videos.videos.list.params': true,
-  'filter:api.recently-added-videos.videos.list.result': true,
-
-  // Filter params/result of the function that fetch videos of the user subscription page
-  'filter:api.user-subscriptions-videos.videos.list.params': true,
-  'filter:api.user-subscriptions-videos.videos.list.result': true,
-
-  // Filter params/result of the function that fetch the video of the video-watch page
-  'filter:api.video-watch.video.get.params': true,
-  'filter:api.video-watch.video.get.result': true,
-
-  // Filter params/result of the function that fetch video playlist elements of the video-watch page
-  'filter:api.video-watch.video-playlist-elements.get.params': true,
-  'filter:api.video-watch.video-playlist-elements.get.result': true,
-
-  // Filter params/result of the function that fetch the threads of the video-watch page
-  'filter:api.video-watch.video-threads.list.params': true,
-  'filter:api.video-watch.video-threads.list.result': true,
-
-  // Filter params/result of the function that fetch the replies of a thread in the video-watch page
-  'filter:api.video-watch.video-thread-replies.list.params': true,
-  'filter:api.video-watch.video-thread-replies.list.result': true,
-
-  // Filter params/result of the function that fetch videos according to the user search
-  'filter:api.search.videos.list.params': true,
-  'filter:api.search.videos.list.result': true,
-  // Filter params/result of the function that fetch video channels according to the user search
-  'filter:api.search.video-channels.list.params': true,
-  'filter:api.search.video-channels.list.result': true,
-  // Filter params/result of the function that fetch video playlists according to the user search
-  'filter:api.search.video-playlists.list.params': true,
-  'filter:api.search.video-playlists.list.result': true,
-
-  // Filter form
-  'filter:api.signup.registration.create.params': true,
-
-  // Filter params/result of the function that fetch video playlist elements of the my-library page
-  'filter:api.my-library.video-playlist-elements.list.params': true,
-  'filter:api.my-library.video-playlist-elements.list.result': true,
-
-  // Filter the options to create our player
-  'filter:internal.video-watch.player.build-options.params': true,
-  'filter:internal.video-watch.player.build-options.result': true,
-
-  // Filter the options to load a new video in our player
-  'filter:internal.video-watch.player.load-options.params': true,
-  'filter:internal.video-watch.player.load-options.result': true,
-
-  // Filter our SVG icons content
-  'filter:internal.common.svg-icons.get-content.params': true,
-  'filter:internal.common.svg-icons.get-content.result': true,
-
-  // Filter left menu links
-  'filter:left-menu.links.create.result': true,
-
-  // Filter upload page alert messages
-  'filter:upload.messages.create.result': true,
-
-  'filter:login.instance-about-plugin-panels.create.result': true,
-  'filter:signup.instance-about-plugin-panels.create.result': true,
-
-  'filter:share.video-embed-code.build.params': true,
-  'filter:share.video-embed-code.build.result': true,
-  'filter:share.video-playlist-embed-code.build.params': true,
-  'filter:share.video-playlist-embed-code.build.result': true,
-
-  'filter:share.video-embed-url.build.params': true,
-  'filter:share.video-embed-url.build.result': true,
-  'filter:share.video-playlist-embed-url.build.params': true,
-  'filter:share.video-playlist-embed-url.build.result': true,
-
-  'filter:share.video-url.build.params': true,
-  'filter:share.video-url.build.result': true,
-  'filter:share.video-playlist-url.build.params': true,
-  'filter:share.video-playlist-url.build.result': true,
-
-  'filter:video-watch.video-plugin-metadata.result': true,
-
-  // Filter videojs options built for PeerTube player
-  'filter:internal.player.videojs.options.result': true,
-
-  // Filter p2p media loader options built for PeerTube player
-  'filter:internal.player.p2p-media-loader.options.result': true
-}
-
-export type ClientFilterHookName = keyof typeof clientFilterHookObject
-
-export const clientActionHookObject = {
-  // Fired when the application is being initialized
-  'action:application.init': true,
-
-  // Fired when the video watch page is being initialized
-  'action:video-watch.init': true,
-  // Fired when the video watch page loaded the video
-  'action:video-watch.video.loaded': true,
-  // Fired when the player finished loading
-  'action:video-watch.player.loaded': true,
-  // Fired when the video watch page comments(threads) are loaded and load more comments on scroll
-  'action:video-watch.video-threads.loaded': true,
-  // Fired when a user click on 'View x replies' and they're loaded
-  'action:video-watch.video-thread-replies.loaded': true,
-
-  // Fired when the video channel creation page is being initialized
-  'action:video-channel-create.init': true,
-
-  // Fired when the video channel update page is being initialized
-  'action:video-channel-update.init': true,
-  'action:video-channel-update.video-channel.loaded': true,
-
-  // Fired when the page that list video channel videos is being initialized
-  'action:video-channel-videos.init': true,
-  'action:video-channel-videos.video-channel.loaded': true,
-  'action:video-channel-videos.videos.loaded': true,
-
-  // Fired when the page that list video channel playlists is being initialized
-  'action:video-channel-playlists.init': true,
-  'action:video-channel-playlists.video-channel.loaded': true,
-  'action:video-channel-playlists.playlists.loaded': true,
-
-  // Fired when the video edit page (upload, URL/torrent import, update) is being initialized
-  // Contains a `type` and `updateForm` object attributes
-  'action:video-edit.init': true,
-
-  // Fired when values of the video edit form changed
-  'action:video-edit.form.updated': true,
-
-  // Fired when the login page is being initialized
-  'action:login.init': true,
-
-  // Fired when the search page is being initialized
-  'action:search.init': true,
-
-  // Fired every time Angular URL changes
-  'action:router.navigation-end': true,
-
-  // Fired when the registration page is being initialized
-  'action:signup.register.init': true,
-
-  // PeerTube >= 3.2
-  // Fired when the admin plugin settings page is being initialized
-  'action:admin-plugin-settings.init': true,
-
-  // Fired when the video upload page is being initialized
-  'action:video-upload.init': true,
-  // Fired when the video import by URL page is being initialized
-  'action:video-url-import.init': true,
-  // Fired when the video import by torrent/magnet URI page is being initialized
-  'action:video-torrent-import.init': true,
-  // Fired when the "Go Live" page is being initialized
-  'action:go-live.init': true,
-
-  // Fired when the user explicitly logged in/logged out
-  'action:auth-user.logged-in': true,
-  'action:auth-user.logged-out': true,
-  // Fired when the application loaded user information (using tokens from the local storage or after a successful login)
-  'action:auth-user.information-loaded': true,
-
-  // Fired when the modal to download a video/caption is shown
-  'action:modal.video-download.shown': true,
-  // Fired when the modal to share a video/playlist is shown
-  'action:modal.share.shown': true,
-
-  // ####### Embed hooks #######
-  // /!\ In embed scope, peertube helpers are not available
-  // ###########################
-
-  // Fired when the embed loaded the player
-  'action:embed.player.loaded': true
-}
-
-export type ClientActionHookName = keyof typeof clientActionHookObject
-
-export const clientHookObject = Object.assign({}, clientFilterHookObject, clientActionHookObject)
-export type ClientHookName = keyof typeof clientHookObject
-
-export interface ClientHook {
-  runHook <T> (hookName: ClientHookName, result?: T, params?: any): Promise<T>
-}
diff --git a/shared/models/plugins/client/index.ts b/shared/models/plugins/client/index.ts
deleted file mode 100644
index f3e3fcbcf..000000000
--- a/shared/models/plugins/client/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './client-hook.model'
-export * from './plugin-client-scope.type'
-export * from './plugin-element-placeholder.type'
-export * from './plugin-selector-id.type'
-export * from './register-client-form-field.model'
-export * from './register-client-hook.model'
-export * from './register-client-route.model'
-export * from './register-client-settings-script.model'
diff --git a/shared/models/plugins/client/plugin-client-scope.type.ts b/shared/models/plugins/client/plugin-client-scope.type.ts
deleted file mode 100644
index c09a453b8..000000000
--- a/shared/models/plugins/client/plugin-client-scope.type.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export type PluginClientScope =
-  'common' |
-  'video-watch' |
-  'search' |
-  'signup' |
-  'login' |
-  'embed' |
-  'video-edit' |
-  'admin-plugin' |
-  'my-library' |
-  'video-channel'
diff --git a/shared/models/plugins/client/plugin-element-placeholder.type.ts b/shared/models/plugins/client/plugin-element-placeholder.type.ts
deleted file mode 100644
index 7b8a2605b..000000000
--- a/shared/models/plugins/client/plugin-element-placeholder.type.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type PluginElementPlaceholder =
-  'player-next' |
-  'share-modal-playlist-settings' |
-  'share-modal-video-settings'
diff --git a/shared/models/plugins/client/plugin-selector-id.type.ts b/shared/models/plugins/client/plugin-selector-id.type.ts
deleted file mode 100644
index 8d23314b5..000000000
--- a/shared/models/plugins/client/plugin-selector-id.type.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export type PluginSelectorId =
-  'login-form' |
-  'menu-user-dropdown-language-item' |
-  'about-instance-features' |
-  'about-instance-statistics' |
-  'about-instance-moderation' |
-  'about-menu-instance' |
-  'about-menu-peertube' |
-  'about-menu-network' |
-  'about-instance-other-information'
diff --git a/shared/models/plugins/client/register-client-form-field.model.ts b/shared/models/plugins/client/register-client-form-field.model.ts
deleted file mode 100644
index 153c4a6ea..000000000
--- a/shared/models/plugins/client/register-client-form-field.model.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export type RegisterClientFormFieldOptions = {
-  name?: string
-  label?: string
-  type: 'input' | 'input-checkbox' | 'input-password' | 'input-textarea' | 'markdown-text' | 'markdown-enhanced' | 'select' | 'html'
-
-  // For select type
-  options?: { value: string, label: string }[]
-
-  // For html type
-  html?: string
-
-  descriptionHTML?: string
-
-  // Default setting value
-  default?: string | boolean
-
-  // Not supported by plugin setting registration, use registerSettingsScript instead
-  hidden?: (options: any) => boolean
-
-  // Return undefined | null if there is no error or return a string with the detailed error
-  // Not supported by plugin setting registration
-  error?: (options: any) => Promise<{ error: boolean, text?: string }>
-}
-
-export interface RegisterClientVideoFieldOptions {
-  type: 'update' | 'upload' | 'import-url' | 'import-torrent' | 'go-live'
-
-  // Default to 'plugin-settings'
-  tab?: 'main' | 'plugin-settings'
-}
diff --git a/shared/models/plugins/client/register-client-hook.model.ts b/shared/models/plugins/client/register-client-hook.model.ts
deleted file mode 100644
index 81047b21d..000000000
--- a/shared/models/plugins/client/register-client-hook.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ClientHookName } from './client-hook.model'
-
-export interface RegisterClientHookOptions {
-  target: ClientHookName
-  handler: Function
-  priority?: number
-}
diff --git a/shared/models/plugins/client/register-client-route.model.ts b/shared/models/plugins/client/register-client-route.model.ts
deleted file mode 100644
index 271b67834..000000000
--- a/shared/models/plugins/client/register-client-route.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface RegisterClientRouteOptions {
-  route: string
-
-  onMount (options: {
-    rootEl: HTMLElement
-  }): void
-}
diff --git a/shared/models/plugins/client/register-client-settings-script.model.ts b/shared/models/plugins/client/register-client-settings-script.model.ts
deleted file mode 100644
index 117ca4739..000000000
--- a/shared/models/plugins/client/register-client-settings-script.model.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { RegisterServerSettingOptions } from '../server'
-
-export interface RegisterClientSettingsScriptOptions {
-  isSettingHidden (options: {
-    setting: RegisterServerSettingOptions
-    formValues: { [name: string]: any }
-  }): boolean
-}
diff --git a/shared/models/plugins/hook-type.enum.ts b/shared/models/plugins/hook-type.enum.ts
deleted file mode 100644
index a96c943f1..000000000
--- a/shared/models/plugins/hook-type.enum.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const enum HookType {
-  STATIC = 1,
-  ACTION = 2,
-  FILTER = 3
-}
diff --git a/shared/models/plugins/index.ts b/shared/models/plugins/index.ts
deleted file mode 100644
index cbbe4916e..000000000
--- a/shared/models/plugins/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './client'
-export * from './plugin-index'
-export * from './server'
-export * from './hook-type.enum'
-export * from './plugin-package-json.model'
-export * from './plugin.type'
diff --git a/shared/models/plugins/plugin-index/index.ts b/shared/models/plugins/plugin-index/index.ts
deleted file mode 100644
index 913846638..000000000
--- a/shared/models/plugins/plugin-index/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './peertube-plugin-index-list.model'
-export * from './peertube-plugin-index.model'
-export * from './peertube-plugin-latest-version.model'
diff --git a/shared/models/plugins/plugin-index/peertube-plugin-index-list.model.ts b/shared/models/plugins/plugin-index/peertube-plugin-index-list.model.ts
deleted file mode 100644
index ecb46482e..000000000
--- a/shared/models/plugins/plugin-index/peertube-plugin-index-list.model.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { PluginType } from '../plugin.type'
-
-export interface PeertubePluginIndexList {
-  start: number
-  count: number
-  sort: string
-  pluginType?: PluginType
-  currentPeerTubeEngine?: string
-  search?: string
-}
diff --git a/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts b/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts
deleted file mode 100644
index 36dfef943..000000000
--- a/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export interface PeerTubePluginIndex {
-  npmName: string
-  description: string
-  homepage: string
-  createdAt: Date
-  updatedAt: Date
-
-  popularity: number
-
-  latestVersion: string
-
-  official: boolean
-
-  name?: string
-  installed?: boolean
-}
diff --git a/shared/models/plugins/plugin-index/peertube-plugin-latest-version.model.ts b/shared/models/plugins/plugin-index/peertube-plugin-latest-version.model.ts
deleted file mode 100644
index 811a64429..000000000
--- a/shared/models/plugins/plugin-index/peertube-plugin-latest-version.model.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export interface PeertubePluginLatestVersionRequest {
-  currentPeerTubeEngine?: string
-
-  npmNames: string[]
-}
-
-export type PeertubePluginLatestVersionResponse = {
-  npmName: string
-  latestVersion: string | null
-}[]
diff --git a/shared/models/plugins/plugin-package-json.model.ts b/shared/models/plugins/plugin-package-json.model.ts
deleted file mode 100644
index 7ce968ff2..000000000
--- a/shared/models/plugins/plugin-package-json.model.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { PluginClientScope } from './client/plugin-client-scope.type'
-
-export type PluginTranslationPathsJSON = {
-  [ locale: string ]: string
-}
-
-export type ClientScriptJSON = {
-  script: string
-  scopes: PluginClientScope[]
-}
-
-export type PluginPackageJSON = {
-  name: string
-  version: string
-  description: string
-  engine: { peertube: string }
-
-  homepage: string
-  author: string
-  bugs: string
-  library: string
-
-  staticDirs: { [ name: string ]: string }
-  css: string[]
-
-  clientScripts: ClientScriptJSON[]
-
-  translations: PluginTranslationPathsJSON
-}
diff --git a/shared/models/plugins/plugin.type.ts b/shared/models/plugins/plugin.type.ts
deleted file mode 100644
index 016219ceb..000000000
--- a/shared/models/plugins/plugin.type.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const enum PluginType {
-  PLUGIN = 1,
-  THEME = 2
-}
diff --git a/shared/models/plugins/server/api/index.ts b/shared/models/plugins/server/api/index.ts
deleted file mode 100644
index eb59a03f0..000000000
--- a/shared/models/plugins/server/api/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './install-plugin.model'
-export * from './manage-plugin.model'
-export * from './peertube-plugin.model'
diff --git a/shared/models/plugins/server/api/install-plugin.model.ts b/shared/models/plugins/server/api/install-plugin.model.ts
deleted file mode 100644
index a1d009a00..000000000
--- a/shared/models/plugins/server/api/install-plugin.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface InstallOrUpdatePlugin {
-  npmName?: string
-  pluginVersion?: string
-  path?: string
-}
diff --git a/shared/models/plugins/server/api/manage-plugin.model.ts b/shared/models/plugins/server/api/manage-plugin.model.ts
deleted file mode 100644
index 612b3056c..000000000
--- a/shared/models/plugins/server/api/manage-plugin.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface ManagePlugin {
-  npmName: string
-}
diff --git a/shared/models/plugins/server/api/peertube-plugin.model.ts b/shared/models/plugins/server/api/peertube-plugin.model.ts
deleted file mode 100644
index 54c383f57..000000000
--- a/shared/models/plugins/server/api/peertube-plugin.model.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { PluginType } from '../../plugin.type'
-
-export interface PeerTubePlugin {
-  name: string
-  type: PluginType
-  latestVersion: string
-  version: string
-  enabled: boolean
-  uninstalled: boolean
-  peertubeEngine: string
-  description: string
-  homepage: string
-  settings: { [ name: string ]: string }
-  createdAt: Date
-  updatedAt: Date
-}
diff --git a/shared/models/plugins/server/index.ts b/shared/models/plugins/server/index.ts
deleted file mode 100644
index d3ff49d3b..000000000
--- a/shared/models/plugins/server/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './api'
-export * from './managers'
-export * from './settings'
-export * from './plugin-translation.model'
-export * from './register-server-hook.model'
-export * from './server-hook.model'
diff --git a/shared/models/plugins/server/managers/index.ts b/shared/models/plugins/server/managers/index.ts
deleted file mode 100644
index 49365a854..000000000
--- a/shared/models/plugins/server/managers/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-
-export * from './plugin-playlist-privacy-manager.model'
-export * from './plugin-settings-manager.model'
-export * from './plugin-storage-manager.model'
-export * from './plugin-transcoding-manager.model'
-export * from './plugin-video-category-manager.model'
-export * from './plugin-video-language-manager.model'
-export * from './plugin-video-licence-manager.model'
-export * from './plugin-video-privacy-manager.model'
diff --git a/shared/models/plugins/server/managers/plugin-playlist-privacy-manager.model.ts b/shared/models/plugins/server/managers/plugin-playlist-privacy-manager.model.ts
deleted file mode 100644
index 35247c1e3..000000000
--- a/shared/models/plugins/server/managers/plugin-playlist-privacy-manager.model.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { VideoPlaylistPrivacy } from '../../../videos/playlist/video-playlist-privacy.model'
-import { ConstantManager } from '../plugin-constant-manager.model'
-
-export interface PluginPlaylistPrivacyManager extends ConstantManager<VideoPlaylistPrivacy> {
-  /**
-   * PUBLIC = 1,
-   * UNLISTED = 2,
-   * PRIVATE = 3
-   * @deprecated use `deleteConstant` instead
-   */
-  deletePlaylistPrivacy: (privacyKey: VideoPlaylistPrivacy) => boolean
-}
diff --git a/shared/models/plugins/server/managers/plugin-settings-manager.model.ts b/shared/models/plugins/server/managers/plugin-settings-manager.model.ts
deleted file mode 100644
index b628718dd..000000000
--- a/shared/models/plugins/server/managers/plugin-settings-manager.model.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export type SettingValue = string | boolean
-
-export interface SettingEntries {
-  [settingName: string]: SettingValue
-}
-
-export type SettingsChangeCallback = (settings: SettingEntries) => Promise<any>
-
-export interface PluginSettingsManager {
-  getSetting: (name: string) => Promise<SettingValue>
-
-  getSettings: (names: string[]) => Promise<SettingEntries>
-
-  setSetting: (name: string, value: SettingValue) => Promise<any>
-
-  onSettingsChange: (cb: SettingsChangeCallback) => void
-}
diff --git a/shared/models/plugins/server/managers/plugin-storage-manager.model.ts b/shared/models/plugins/server/managers/plugin-storage-manager.model.ts
deleted file mode 100644
index 51567044a..000000000
--- a/shared/models/plugins/server/managers/plugin-storage-manager.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface PluginStorageManager {
-  getData: (key: string) => Promise<string>
-
-  storeData: (key: string, data: any) => Promise<any>
-}
diff --git a/shared/models/plugins/server/managers/plugin-transcoding-manager.model.ts b/shared/models/plugins/server/managers/plugin-transcoding-manager.model.ts
deleted file mode 100644
index b6fb46ba0..000000000
--- a/shared/models/plugins/server/managers/plugin-transcoding-manager.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { EncoderOptionsBuilder } from '../../../videos/transcoding'
-
-export interface PluginTranscodingManager {
-  addLiveProfile (encoder: string, profile: string, builder: EncoderOptionsBuilder): boolean
-
-  addVODProfile (encoder: string, profile: string, builder: EncoderOptionsBuilder): boolean
-
-  addLiveEncoderPriority (streamType: 'audio' | 'video', encoder: string, priority: number): void
-
-  addVODEncoderPriority (streamType: 'audio' | 'video', encoder: string, priority: number): void
-
-  removeAllProfilesAndEncoderPriorities(): void
-}
diff --git a/shared/models/plugins/server/managers/plugin-video-category-manager.model.ts b/shared/models/plugins/server/managers/plugin-video-category-manager.model.ts
deleted file mode 100644
index cf3d828fe..000000000
--- a/shared/models/plugins/server/managers/plugin-video-category-manager.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ConstantManager } from '../plugin-constant-manager.model'
-
-export interface PluginVideoCategoryManager extends ConstantManager<number> {
-  /**
-   * @deprecated use `addConstant` instead
-   */
-  addCategory: (categoryKey: number, categoryLabel: string) => boolean
-
-  /**
-   * @deprecated use `deleteConstant` instead
-   */
-  deleteCategory: (categoryKey: number) => boolean
-}
diff --git a/shared/models/plugins/server/managers/plugin-video-language-manager.model.ts b/shared/models/plugins/server/managers/plugin-video-language-manager.model.ts
deleted file mode 100644
index 69fc8e503..000000000
--- a/shared/models/plugins/server/managers/plugin-video-language-manager.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ConstantManager } from '../plugin-constant-manager.model'
-
-export interface PluginVideoLanguageManager extends ConstantManager<string> {
-  /**
-   * @deprecated use `addConstant` instead
-   */
-  addLanguage: (languageKey: string, languageLabel: string) => boolean
-
-  /**
-   * @deprecated use `deleteConstant` instead
-   */
-  deleteLanguage: (languageKey: string) => boolean
-}
diff --git a/shared/models/plugins/server/managers/plugin-video-licence-manager.model.ts b/shared/models/plugins/server/managers/plugin-video-licence-manager.model.ts
deleted file mode 100644
index 21b422270..000000000
--- a/shared/models/plugins/server/managers/plugin-video-licence-manager.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ConstantManager } from '../plugin-constant-manager.model'
-
-export interface PluginVideoLicenceManager extends ConstantManager<number> {
-  /**
-   * @deprecated use `addConstant` instead
-   */
-  addLicence: (licenceKey: number, licenceLabel: string) => boolean
-
-  /**
-   * @deprecated use `deleteConstant` instead
-   */
-  deleteLicence: (licenceKey: number) => boolean
-}
diff --git a/shared/models/plugins/server/managers/plugin-video-privacy-manager.model.ts b/shared/models/plugins/server/managers/plugin-video-privacy-manager.model.ts
deleted file mode 100644
index a237037db..000000000
--- a/shared/models/plugins/server/managers/plugin-video-privacy-manager.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { VideoPrivacy } from '../../../videos/video-privacy.enum'
-import { ConstantManager } from '../plugin-constant-manager.model'
-
-export interface PluginVideoPrivacyManager extends ConstantManager<VideoPrivacy> {
-  /**
-   * PUBLIC = 1,
-   * UNLISTED = 2,
-   * PRIVATE = 3
-   * INTERNAL = 4
-   * @deprecated use `deleteConstant` instead
-   */
-  deletePrivacy: (privacyKey: VideoPrivacy) => boolean
-}
diff --git a/shared/models/plugins/server/plugin-constant-manager.model.ts b/shared/models/plugins/server/plugin-constant-manager.model.ts
deleted file mode 100644
index 4de3ce38f..000000000
--- a/shared/models/plugins/server/plugin-constant-manager.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface ConstantManager <K extends string | number> {
-  addConstant: (key: K, label: string) => boolean
-  deleteConstant: (key: K) => boolean
-  getConstantValue: (key: K) => string
-  getConstants: () => Record<K, string>
-  resetConstants: () => void
-}
diff --git a/shared/models/plugins/server/plugin-translation.model.ts b/shared/models/plugins/server/plugin-translation.model.ts
deleted file mode 100644
index a2dd8e560..000000000
--- a/shared/models/plugins/server/plugin-translation.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type PluginTranslation = {
-  [ npmName: string ]: {
-    [ key: string ]: string
-  }
-}
diff --git a/shared/models/plugins/server/register-server-hook.model.ts b/shared/models/plugins/server/register-server-hook.model.ts
deleted file mode 100644
index 746fdc329..000000000
--- a/shared/models/plugins/server/register-server-hook.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ServerHookName } from './server-hook.model'
-
-export interface RegisterServerHookOptions {
-  target: ServerHookName
-  handler: Function
-  priority?: number
-}
diff --git a/shared/models/plugins/server/server-hook.model.ts b/shared/models/plugins/server/server-hook.model.ts
deleted file mode 100644
index cf387ffd7..000000000
--- a/shared/models/plugins/server/server-hook.model.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-// {hookType}:{root}.{location}.{subLocation?}.{actionType}.{target}
-
-export const serverFilterHookObject = {
-  // Filter params/result used to list videos for the REST API
-  // (used by the trending page, recently-added page, local page etc)
-  'filter:api.videos.list.params': true,
-  'filter:api.videos.list.result': true,
-
-  // Filter params/result used to list a video playlists videos
-  // for the REST API
-  'filter:api.video-playlist.videos.list.params': true,
-  'filter:api.video-playlist.videos.list.result': true,
-
-  // Filter params/result used to list account videos for the REST API
-  'filter:api.accounts.videos.list.params': true,
-  'filter:api.accounts.videos.list.result': true,
-
-  // Filter params/result used to list channel videos for the REST API
-  'filter:api.video-channels.videos.list.params': true,
-  'filter:api.video-channels.videos.list.result': true,
-
-  // Filter params/result used to list my user videos for the REST API
-  'filter:api.user.me.videos.list.params': true,
-  'filter:api.user.me.videos.list.result': true,
-
-  // Filter params/result used to list overview videos for the REST API
-  'filter:api.overviews.videos.list.params': true,
-  'filter:api.overviews.videos.list.result': true,
-
-  // Filter params/result used to list subscription videos for the REST API
-  'filter:api.user.me.subscription-videos.list.params': true,
-  'filter:api.user.me.subscription-videos.list.result': true,
-
-  // Filter params/results to search videos/channels in the DB or on the remote index
-  'filter:api.search.videos.local.list.params': true,
-  'filter:api.search.videos.local.list.result': true,
-  'filter:api.search.videos.index.list.params': true,
-  'filter:api.search.videos.index.list.result': true,
-  'filter:api.search.video-channels.local.list.params': true,
-  'filter:api.search.video-channels.local.list.result': true,
-  'filter:api.search.video-channels.index.list.params': true,
-  'filter:api.search.video-channels.index.list.result': true,
-  'filter:api.search.video-playlists.local.list.params': true,
-  'filter:api.search.video-playlists.local.list.result': true,
-  'filter:api.search.video-playlists.index.list.params': true,
-  'filter:api.search.video-playlists.index.list.result': true,
-
-  // Filter the result of the get function
-  // Used to get detailed video information (video watch page for example)
-  'filter:api.video.get.result': true,
-
-  // Filter params/results when listing video channels
-  'filter:api.video-channels.list.params': true,
-  'filter:api.video-channels.list.result': true,
-
-  // Filter the result when getting a video channel
-  'filter:api.video-channel.get.result': true,
-
-  // Filter the result of the accept upload/live, import via torrent/url functions
-  // If this function returns false then the upload is aborted with an error
-  'filter:api.video.upload.accept.result': true,
-  'filter:api.live-video.create.accept.result': true,
-  'filter:api.video.pre-import-url.accept.result': true,
-  'filter:api.video.pre-import-torrent.accept.result': true,
-  'filter:api.video.post-import-url.accept.result': true,
-  'filter:api.video.post-import-torrent.accept.result': true,
-  'filter:api.video.update-file.accept.result': true,
-  // Filter the result of the accept comment (thread or reply) functions
-  // If the functions return false then the user cannot post its comment
-  'filter:api.video-thread.create.accept.result': true,
-  'filter:api.video-comment-reply.create.accept.result': true,
-
-  // Filter attributes when creating video object
-  'filter:api.video.upload.video-attribute.result': true,
-  'filter:api.video.import-url.video-attribute.result': true,
-  'filter:api.video.import-torrent.video-attribute.result': true,
-  'filter:api.video.live.video-attribute.result': true,
-
-  // Filter params/result used to list threads of a specific video
-  // (used by the video watch page)
-  'filter:api.video-threads.list.params': true,
-  'filter:api.video-threads.list.result': true,
-
-  // Filter params/result used to list replies of a specific thread
-  // (used by the video watch page when we click on the "View replies" button)
-  'filter:api.video-thread-comments.list.params': true,
-  'filter:api.video-thread-comments.list.result': true,
-
-  // Filter get stats result
-  'filter:api.server.stats.get.result': true,
-
-  // Filter result used to check if we need to auto blacklist a video
-  // (fired when a local or remote video is created or updated)
-  'filter:video.auto-blacklist.result': true,
-
-  // Filter result used to check if a user can register on the instance
-  'filter:api.user.signup.allowed.result': true,
-
-  // Filter result used to check if a user can send a registration request on the instance
-  // PeerTube >= 5.1
-  'filter:api.user.request-signup.allowed.result': true,
-
-  // Filter result used to check if video/torrent download is allowed
-  'filter:api.download.video.allowed.result': true,
-  'filter:api.download.torrent.allowed.result': true,
-
-  // Filter result to check if the embed is allowed for a particular request
-  'filter:html.embed.video.allowed.result': true,
-  'filter:html.embed.video-playlist.allowed.result': true,
-
-  // Peertube >= 5.2
-  'filter:html.client.json-ld.result': true,
-
-  'filter:job-queue.process.params': true,
-  'filter:job-queue.process.result': true,
-
-  'filter:transcoding.manual.resolutions-to-transcode.result': true,
-  'filter:transcoding.auto.resolutions-to-transcode.result': true,
-
-  'filter:activity-pub.remote-video-comment.create.accept.result': true,
-
-  'filter:activity-pub.activity.context.build.result': true,
-
-  // Filter the result of video JSON LD builder
-  // You may also need to use filter:activity-pub.activity.context.build.result to also update JSON LD context
-  'filter:activity-pub.video.json-ld.build.result': true,
-
-  // Filter result to allow custom XMLNS definitions in podcast RSS feeds
-  // Peertube >= 5.2
-  'filter:feed.podcast.rss.create-custom-xmlns.result': true,
-
-  // Filter result to allow custom tags in podcast RSS feeds
-  // Peertube >= 5.2
-  'filter:feed.podcast.channel.create-custom-tags.result': true,
-  // Peertube >= 5.2
-  'filter:feed.podcast.video.create-custom-tags.result': true
-}
-
-export type ServerFilterHookName = keyof typeof serverFilterHookObject
-
-export const serverActionHookObject = {
-  // Fired when the application has been loaded and is listening HTTP requests
-  'action:application.listening': true,
-
-  // Fired when a new notification is created
-  'action:notifier.notification.created': true,
-
-  // API actions hooks give access to the original express `req` and `res` parameters
-
-  // Fired when a local video is updated
-  'action:api.video.updated': true,
-  // Fired when a local video is deleted
-  'action:api.video.deleted': true,
-  // Fired when a local video is uploaded
-  'action:api.video.uploaded': true,
-  // Fired when a local video is viewed
-  'action:api.video.viewed': true,
-
-  // Fired when a local video file has been replaced by a new one
-  'action:api.video.file-updated': true,
-
-  // Fired when a video channel is created
-  'action:api.video-channel.created': true,
-  // Fired when a video channel is updated
-  'action:api.video-channel.updated': true,
-  // Fired when a video channel is deleted
-  'action:api.video-channel.deleted': true,
-
-  // Fired when a live video is created
-  'action:api.live-video.created': true,
-  // Fired when a live video starts or ends
-  // Peertube >= 5.2
-  'action:live.video.state.updated': true,
-
-  // Fired when a thread is created
-  'action:api.video-thread.created': true,
-  // Fired when a reply to a thread is created
-  'action:api.video-comment-reply.created': true,
-  // Fired when a comment (thread or reply) is deleted
-  'action:api.video-comment.deleted': true,
-
-  // Fired when a caption is created
-  'action:api.video-caption.created': true,
-  // Fired when a caption is deleted
-  'action:api.video-caption.deleted': true,
-
-  // Fired when a user is blocked (banned)
-  'action:api.user.blocked': true,
-  // Fired when a user is unblocked (unbanned)
-  'action:api.user.unblocked': true,
-  // Fired when a user registered on the instance
-  'action:api.user.registered': true,
-  // Fired when a user requested registration on the instance
-  // PeerTube >= 5.1
-  'action:api.user.requested-registration': true,
-  // Fired when an admin/moderator created a user
-  'action:api.user.created': true,
-  // Fired when a user is removed by an admin/moderator
-  'action:api.user.deleted': true,
-  // Fired when a user is updated by an admin/moderator
-  'action:api.user.updated': true,
-
-  // Fired when a user got a new oauth2 token
-  'action:api.user.oauth2-got-token': true,
-
-  // Fired when a video is added to a playlist
-  'action:api.video-playlist-element.created': true,
-
-  // Fired when a remote video has been created/updated
-  'action:activity-pub.remote-video.created': true,
-  'action:activity-pub.remote-video.updated': true
-}
-
-export type ServerActionHookName = keyof typeof serverActionHookObject
-
-export const serverHookObject = Object.assign({}, serverFilterHookObject, serverActionHookObject)
-export type ServerHookName = keyof typeof serverHookObject
-
-export interface ServerHook {
-  runHook <T> (hookName: ServerHookName, result?: T, params?: any): Promise<T>
-}
diff --git a/shared/models/plugins/server/settings/index.ts b/shared/models/plugins/server/settings/index.ts
deleted file mode 100644
index b456de019..000000000
--- a/shared/models/plugins/server/settings/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './public-server.setting'
-export * from './register-server-setting.model'
diff --git a/shared/models/plugins/server/settings/public-server.setting.ts b/shared/models/plugins/server/settings/public-server.setting.ts
deleted file mode 100644
index d38e5424a..000000000
--- a/shared/models/plugins/server/settings/public-server.setting.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SettingEntries } from '../managers/plugin-settings-manager.model'
-
-export interface PublicServerSetting {
-  publicSettings: SettingEntries
-}
diff --git a/shared/models/plugins/server/settings/register-server-setting.model.ts b/shared/models/plugins/server/settings/register-server-setting.model.ts
deleted file mode 100644
index d9a798cac..000000000
--- a/shared/models/plugins/server/settings/register-server-setting.model.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { RegisterClientFormFieldOptions } from '../../client'
-
-export type RegisterServerSettingOptions = RegisterClientFormFieldOptions & {
-  // If the setting is not private, anyone can view its value (client code included)
-  // If the setting is private, only server-side hooks can access it
-  // Mainly used by the PeerTube client to get admin config
-  private: boolean
-}
-
-export interface RegisteredServerSettings {
-  registeredSettings: RegisterServerSettingOptions[]
-}
diff --git a/shared/models/redundancy/index.ts b/shared/models/redundancy/index.ts
deleted file mode 100644
index 641a5d625..000000000
--- a/shared/models/redundancy/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './video-redundancies-filters.model'
-export * from './video-redundancy-config-filter.type'
-export * from './video-redundancy.model'
-export * from './videos-redundancy-strategy.model'
diff --git a/shared/models/redundancy/video-redundancies-filters.model.ts b/shared/models/redundancy/video-redundancies-filters.model.ts
deleted file mode 100644
index 05ba7dfd3..000000000
--- a/shared/models/redundancy/video-redundancies-filters.model.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type VideoRedundanciesTarget = 'my-videos' | 'remote-videos'
diff --git a/shared/models/redundancy/video-redundancy-config-filter.type.ts b/shared/models/redundancy/video-redundancy-config-filter.type.ts
deleted file mode 100644
index bb1ae701c..000000000
--- a/shared/models/redundancy/video-redundancy-config-filter.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type VideoRedundancyConfigFilter = 'nobody' | 'anybody' | 'followings'
diff --git a/shared/models/redundancy/video-redundancy.model.ts b/shared/models/redundancy/video-redundancy.model.ts
deleted file mode 100644
index fa6e05832..000000000
--- a/shared/models/redundancy/video-redundancy.model.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-export interface VideoRedundancy {
-  id: number
-  name: string
-  url: string
-  uuid: string
-
-  redundancies: {
-    files: FileRedundancyInformation[]
-
-    streamingPlaylists: StreamingPlaylistRedundancyInformation[]
-  }
-}
-
-interface RedundancyInformation {
-  id: number
-  fileUrl: string
-  strategy: string
-
-  createdAt: Date | string
-  updatedAt: Date | string
-
-  expiresOn: Date | string
-
-  size: number
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface FileRedundancyInformation extends RedundancyInformation {
-
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface StreamingPlaylistRedundancyInformation extends RedundancyInformation {
-
-}
diff --git a/shared/models/redundancy/videos-redundancy-strategy.model.ts b/shared/models/redundancy/videos-redundancy-strategy.model.ts
deleted file mode 100644
index 15409abf0..000000000
--- a/shared/models/redundancy/videos-redundancy-strategy.model.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export type VideoRedundancyStrategy = 'most-views' | 'trending' | 'recently-added'
-export type VideoRedundancyStrategyWithManual = VideoRedundancyStrategy | 'manual'
-
-export type MostViewsRedundancyStrategy = {
-  strategy: 'most-views'
-  size: number
-  minLifetime: number
-}
-
-export type TrendingRedundancyStrategy = {
-  strategy: 'trending'
-  size: number
-  minLifetime: number
-}
-
-export type RecentlyAddedStrategy = {
-  strategy: 'recently-added'
-  size: number
-  minViews: number
-  minLifetime: number
-}
-
-export type VideosRedundancyStrategy = MostViewsRedundancyStrategy | TrendingRedundancyStrategy | RecentlyAddedStrategy
diff --git a/shared/models/runners/abort-runner-job-body.model.ts b/shared/models/runners/abort-runner-job-body.model.ts
deleted file mode 100644
index 0b9c46c91..000000000
--- a/shared/models/runners/abort-runner-job-body.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface AbortRunnerJobBody {
-  runnerToken: string
-  jobToken: string
-
-  reason: string
-}
diff --git a/shared/models/runners/accept-runner-job-body.model.ts b/shared/models/runners/accept-runner-job-body.model.ts
deleted file mode 100644
index cb266c4e6..000000000
--- a/shared/models/runners/accept-runner-job-body.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface AcceptRunnerJobBody {
-  runnerToken: string
-}
diff --git a/shared/models/runners/accept-runner-job-result.model.ts b/shared/models/runners/accept-runner-job-result.model.ts
deleted file mode 100644
index f2094b945..000000000
--- a/shared/models/runners/accept-runner-job-result.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RunnerJobPayload } from './runner-job-payload.model'
-import { RunnerJob } from './runner-job.model'
-
-export interface AcceptRunnerJobResult <T extends RunnerJobPayload = RunnerJobPayload> {
-  job: RunnerJob<T> & { jobToken: string }
-}
diff --git a/shared/models/runners/error-runner-job-body.model.ts b/shared/models/runners/error-runner-job-body.model.ts
deleted file mode 100644
index ac8568409..000000000
--- a/shared/models/runners/error-runner-job-body.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface ErrorRunnerJobBody {
-  runnerToken: string
-  jobToken: string
-
-  message: string
-}
diff --git a/shared/models/runners/index.ts b/shared/models/runners/index.ts
deleted file mode 100644
index a52b82d2e..000000000
--- a/shared/models/runners/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export * from './abort-runner-job-body.model'
-export * from './accept-runner-job-body.model'
-export * from './accept-runner-job-result.model'
-export * from './error-runner-job-body.model'
-export * from './list-runner-jobs-query.model'
-export * from './list-runner-registration-tokens.model'
-export * from './list-runners-query.model'
-export * from './register-runner-body.model'
-export * from './register-runner-result.model'
-export * from './request-runner-job-body.model'
-export * from './request-runner-job-result.model'
-export * from './runner-job-payload.model'
-export * from './runner-job-private-payload.model'
-export * from './runner-job-state.model'
-export * from './runner-job-success-body.model'
-export * from './runner-job-type.type'
-export * from './runner-job-update-body.model'
-export * from './runner-job.model'
-export * from './runner-registration-token'
-export * from './runner.model'
-export * from './unregister-runner-body.model'
diff --git a/shared/models/runners/list-runner-jobs-query.model.ts b/shared/models/runners/list-runner-jobs-query.model.ts
deleted file mode 100644
index ef19b31fa..000000000
--- a/shared/models/runners/list-runner-jobs-query.model.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { RunnerJobState } from './runner-job-state.model'
-
-export interface ListRunnerJobsQuery {
-  start?: number
-  count?: number
-  sort?: string
-  search?: string
-  stateOneOf?: RunnerJobState[]
-}
diff --git a/shared/models/runners/list-runner-registration-tokens.model.ts b/shared/models/runners/list-runner-registration-tokens.model.ts
deleted file mode 100644
index 872e059cf..000000000
--- a/shared/models/runners/list-runner-registration-tokens.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface ListRunnerRegistrationTokensQuery {
-  start?: number
-  count?: number
-  sort?: string
-}
diff --git a/shared/models/runners/list-runners-query.model.ts b/shared/models/runners/list-runners-query.model.ts
deleted file mode 100644
index d4362e4c5..000000000
--- a/shared/models/runners/list-runners-query.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface ListRunnersQuery {
-  start?: number
-  count?: number
-  sort?: string
-}
diff --git a/shared/models/runners/register-runner-body.model.ts b/shared/models/runners/register-runner-body.model.ts
deleted file mode 100644
index 969bb35e1..000000000
--- a/shared/models/runners/register-runner-body.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface RegisterRunnerBody {
-  registrationToken: string
-
-  name: string
-  description?: string
-}
diff --git a/shared/models/runners/register-runner-result.model.ts b/shared/models/runners/register-runner-result.model.ts
deleted file mode 100644
index e31776c6a..000000000
--- a/shared/models/runners/register-runner-result.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface RegisterRunnerResult {
-  id: number
-  runnerToken: string
-}
diff --git a/shared/models/runners/request-runner-job-body.model.ts b/shared/models/runners/request-runner-job-body.model.ts
deleted file mode 100644
index 0970d9007..000000000
--- a/shared/models/runners/request-runner-job-body.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface RequestRunnerJobBody {
-  runnerToken: string
-}
diff --git a/shared/models/runners/request-runner-job-result.model.ts b/shared/models/runners/request-runner-job-result.model.ts
deleted file mode 100644
index 98601c42c..000000000
--- a/shared/models/runners/request-runner-job-result.model.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RunnerJobPayload } from './runner-job-payload.model'
-import { RunnerJobType } from './runner-job-type.type'
-
-export interface RequestRunnerJobResult <P extends RunnerJobPayload = RunnerJobPayload> {
-  availableJobs: {
-    uuid: string
-    type: RunnerJobType
-    payload: P
-  }[]
-}
diff --git a/shared/models/runners/runner-job-payload.model.ts b/shared/models/runners/runner-job-payload.model.ts
deleted file mode 100644
index 3dda6c51f..000000000
--- a/shared/models/runners/runner-job-payload.model.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { VideoStudioTaskPayload } from '../server'
-
-export type RunnerJobVODPayload =
-  RunnerJobVODWebVideoTranscodingPayload |
-  RunnerJobVODHLSTranscodingPayload |
-  RunnerJobVODAudioMergeTranscodingPayload
-
-export type RunnerJobPayload =
-  RunnerJobVODPayload |
-  RunnerJobLiveRTMPHLSTranscodingPayload |
-  RunnerJobStudioTranscodingPayload
-
-// ---------------------------------------------------------------------------
-
-export interface RunnerJobVODWebVideoTranscodingPayload {
-  input: {
-    videoFileUrl: string
-  }
-
-  output: {
-    resolution: number
-    fps: number
-  }
-}
-
-export interface RunnerJobVODHLSTranscodingPayload {
-  input: {
-    videoFileUrl: string
-  }
-
-  output: {
-    resolution: number
-    fps: number
-  }
-}
-
-export interface RunnerJobVODAudioMergeTranscodingPayload {
-  input: {
-    audioFileUrl: string
-    previewFileUrl: string
-  }
-
-  output: {
-    resolution: number
-    fps: number
-  }
-}
-
-export interface RunnerJobStudioTranscodingPayload {
-  input: {
-    videoFileUrl: string
-  }
-
-  tasks: VideoStudioTaskPayload[]
-}
-
-// ---------------------------------------------------------------------------
-
-export function isAudioMergeTranscodingPayload (payload: RunnerJobPayload): payload is RunnerJobVODAudioMergeTranscodingPayload {
-  return !!(payload as RunnerJobVODAudioMergeTranscodingPayload).input.audioFileUrl
-}
-
-// ---------------------------------------------------------------------------
-
-export interface RunnerJobLiveRTMPHLSTranscodingPayload {
-  input: {
-    rtmpUrl: string
-  }
-
-  output: {
-    toTranscode: {
-      resolution: number
-      fps: number
-    }[]
-
-    segmentDuration: number
-    segmentListSize: number
-  }
-}
diff --git a/shared/models/runners/runner-job-private-payload.model.ts b/shared/models/runners/runner-job-private-payload.model.ts
deleted file mode 100644
index 529034db8..000000000
--- a/shared/models/runners/runner-job-private-payload.model.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { VideoStudioTaskPayload } from '../server'
-
-export type RunnerJobVODPrivatePayload =
-  RunnerJobVODWebVideoTranscodingPrivatePayload |
-  RunnerJobVODAudioMergeTranscodingPrivatePayload |
-  RunnerJobVODHLSTranscodingPrivatePayload
-
-export type RunnerJobPrivatePayload =
-  RunnerJobVODPrivatePayload |
-  RunnerJobLiveRTMPHLSTranscodingPrivatePayload |
-  RunnerJobVideoStudioTranscodingPrivatePayload
-
-// ---------------------------------------------------------------------------
-
-export interface RunnerJobVODWebVideoTranscodingPrivatePayload {
-  videoUUID: string
-  isNewVideo: boolean
-}
-
-export interface RunnerJobVODAudioMergeTranscodingPrivatePayload {
-  videoUUID: string
-  isNewVideo: boolean
-}
-
-export interface RunnerJobVODHLSTranscodingPrivatePayload {
-  videoUUID: string
-  isNewVideo: boolean
-  deleteWebVideoFiles: boolean
-}
-
-// ---------------------------------------------------------------------------
-
-export interface RunnerJobLiveRTMPHLSTranscodingPrivatePayload {
-  videoUUID: string
-  masterPlaylistName: string
-  outputDirectory: string
-  sessionId: string
-}
-
-// ---------------------------------------------------------------------------
-
-export interface RunnerJobVideoStudioTranscodingPrivatePayload {
-  videoUUID: string
-  originalTasks: VideoStudioTaskPayload[]
-}
diff --git a/shared/models/runners/runner-job-state.model.ts b/shared/models/runners/runner-job-state.model.ts
deleted file mode 100644
index 7ed34b3bf..000000000
--- a/shared/models/runners/runner-job-state.model.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export enum RunnerJobState {
-  PENDING = 1,
-  PROCESSING = 2,
-  COMPLETED = 3,
-  ERRORED = 4,
-  WAITING_FOR_PARENT_JOB = 5,
-  CANCELLED = 6,
-  PARENT_ERRORED = 7,
-  PARENT_CANCELLED = 8,
-  COMPLETING = 9
-}
diff --git a/shared/models/runners/runner-job-success-body.model.ts b/shared/models/runners/runner-job-success-body.model.ts
deleted file mode 100644
index f45336b05..000000000
--- a/shared/models/runners/runner-job-success-body.model.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-export interface RunnerJobSuccessBody {
-  runnerToken: string
-  jobToken: string
-
-  payload: RunnerJobSuccessPayload
-}
-
-// ---------------------------------------------------------------------------
-
-export type RunnerJobSuccessPayload =
-  VODWebVideoTranscodingSuccess |
-  VODHLSTranscodingSuccess |
-  VODAudioMergeTranscodingSuccess |
-  LiveRTMPHLSTranscodingSuccess |
-  VideoStudioTranscodingSuccess
-
-export interface VODWebVideoTranscodingSuccess {
-  videoFile: Blob | string
-}
-
-export interface VODHLSTranscodingSuccess {
-  videoFile: Blob | string
-  resolutionPlaylistFile: Blob | string
-}
-
-export interface VODAudioMergeTranscodingSuccess {
-  videoFile: Blob | string
-}
-
-export interface LiveRTMPHLSTranscodingSuccess {
-
-}
-
-export interface VideoStudioTranscodingSuccess {
-  videoFile: Blob | string
-}
-
-export function isWebVideoOrAudioMergeTranscodingPayloadSuccess (
-  payload: RunnerJobSuccessPayload
-): payload is VODHLSTranscodingSuccess | VODAudioMergeTranscodingSuccess {
-  return !!(payload as VODHLSTranscodingSuccess | VODAudioMergeTranscodingSuccess)?.videoFile
-}
-
-export function isHLSTranscodingPayloadSuccess (payload: RunnerJobSuccessPayload): payload is VODHLSTranscodingSuccess {
-  return !!(payload as VODHLSTranscodingSuccess)?.resolutionPlaylistFile
-}
diff --git a/shared/models/runners/runner-job-type.type.ts b/shared/models/runners/runner-job-type.type.ts
deleted file mode 100644
index 91b92a729..000000000
--- a/shared/models/runners/runner-job-type.type.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type RunnerJobType =
-  'vod-web-video-transcoding' |
-  'vod-hls-transcoding' |
-  'vod-audio-merge-transcoding' |
-  'live-rtmp-hls-transcoding' |
-  'video-studio-transcoding'
diff --git a/shared/models/runners/runner-job-update-body.model.ts b/shared/models/runners/runner-job-update-body.model.ts
deleted file mode 100644
index ed94bbe63..000000000
--- a/shared/models/runners/runner-job-update-body.model.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export interface RunnerJobUpdateBody {
-  runnerToken: string
-  jobToken: string
-
-  progress?: number
-  payload?: RunnerJobUpdatePayload
-}
-
-// ---------------------------------------------------------------------------
-
-export type RunnerJobUpdatePayload = LiveRTMPHLSTranscodingUpdatePayload
-
-export interface LiveRTMPHLSTranscodingUpdatePayload {
-  type: 'add-chunk' | 'remove-chunk'
-
-  masterPlaylistFile?: Blob | string
-
-  resolutionPlaylistFilename?: string
-  resolutionPlaylistFile?: Blob | string
-
-  videoChunkFilename: string
-  videoChunkFile?: Blob | string
-}
-
-export function isLiveRTMPHLSTranscodingUpdatePayload (value: RunnerJobUpdatePayload): value is LiveRTMPHLSTranscodingUpdatePayload {
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-  return !!(value as LiveRTMPHLSTranscodingUpdatePayload)?.videoChunkFilename
-}
diff --git a/shared/models/runners/runner-job.model.ts b/shared/models/runners/runner-job.model.ts
deleted file mode 100644
index 080093563..000000000
--- a/shared/models/runners/runner-job.model.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { VideoConstant } from '../videos'
-import { RunnerJobPayload } from './runner-job-payload.model'
-import { RunnerJobPrivatePayload } from './runner-job-private-payload.model'
-import { RunnerJobState } from './runner-job-state.model'
-import { RunnerJobType } from './runner-job-type.type'
-
-export interface RunnerJob <T extends RunnerJobPayload = RunnerJobPayload> {
-  uuid: string
-
-  type: RunnerJobType
-
-  state: VideoConstant<RunnerJobState>
-
-  payload: T
-
-  failures: number
-  error: string | null
-
-  progress: number
-  priority: number
-
-  startedAt: Date | string
-  createdAt: Date | string
-  updatedAt: Date | string
-  finishedAt: Date | string
-
-  parent?: {
-    type: RunnerJobType
-    state: VideoConstant<RunnerJobState>
-    uuid: string
-  }
-
-  // If associated to a runner
-  runner?: {
-    id: number
-    name: string
-
-    description: string
-  }
-}
-
-// eslint-disable-next-line max-len
-export interface RunnerJobAdmin <T extends RunnerJobPayload = RunnerJobPayload, U extends RunnerJobPrivatePayload = RunnerJobPrivatePayload> extends RunnerJob<T> {
-  privatePayload: U
-}
diff --git a/shared/models/runners/runner-registration-token.ts b/shared/models/runners/runner-registration-token.ts
deleted file mode 100644
index 0a157aa51..000000000
--- a/shared/models/runners/runner-registration-token.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export interface RunnerRegistrationToken {
-  id: number
-
-  registrationToken: string
-
-  createdAt: Date
-  updatedAt: Date
-
-  registeredRunnersCount: number
-}
diff --git a/shared/models/runners/runner.model.ts b/shared/models/runners/runner.model.ts
deleted file mode 100644
index 3284f2992..000000000
--- a/shared/models/runners/runner.model.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface Runner {
-  id: number
-
-  name: string
-  description: string
-
-  ip: string
-  lastContact: Date | string
-
-  createdAt: Date | string
-  updatedAt: Date | string
-}
diff --git a/shared/models/runners/unregister-runner-body.model.ts b/shared/models/runners/unregister-runner-body.model.ts
deleted file mode 100644
index d3465c5d6..000000000
--- a/shared/models/runners/unregister-runner-body.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface UnregisterRunnerBody {
-  runnerToken: string
-}
diff --git a/shared/models/search/boolean-both-query.model.ts b/shared/models/search/boolean-both-query.model.ts
deleted file mode 100644
index d6a438249..000000000
--- a/shared/models/search/boolean-both-query.model.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export type BooleanBothQuery = 'true' | 'false' | 'both'
-export type BooleanQuery = 'true' | 'false'
diff --git a/shared/models/search/index.ts b/shared/models/search/index.ts
deleted file mode 100644
index 50aeeddc8..000000000
--- a/shared/models/search/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './boolean-both-query.model'
-export * from './search-target-query.model'
-export * from './videos-common-query.model'
-export * from './video-channels-search-query.model'
-export * from './video-playlists-search-query.model'
-export * from './videos-search-query.model'
diff --git a/shared/models/search/search-target-query.model.ts b/shared/models/search/search-target-query.model.ts
deleted file mode 100644
index 3bb2e0d31..000000000
--- a/shared/models/search/search-target-query.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type SearchTargetType = 'local' | 'search-index'
-
-export interface SearchTargetQuery {
-  searchTarget?: SearchTargetType
-}
diff --git a/shared/models/search/video-channels-search-query.model.ts b/shared/models/search/video-channels-search-query.model.ts
deleted file mode 100644
index b68a1e80b..000000000
--- a/shared/models/search/video-channels-search-query.model.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { SearchTargetQuery } from './search-target-query.model'
-
-export interface VideoChannelsSearchQuery extends SearchTargetQuery {
-  search?: string
-
-  start?: number
-  count?: number
-  sort?: string
-
-  host?: string
-  handles?: string[]
-}
-
-export interface VideoChannelsSearchQueryAfterSanitize extends VideoChannelsSearchQuery {
-  start: number
-  count: number
-  sort: string
-}
diff --git a/shared/models/search/video-playlists-search-query.model.ts b/shared/models/search/video-playlists-search-query.model.ts
deleted file mode 100644
index d9027eb5b..000000000
--- a/shared/models/search/video-playlists-search-query.model.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { SearchTargetQuery } from './search-target-query.model'
-
-export interface VideoPlaylistsSearchQuery extends SearchTargetQuery {
-  search?: string
-
-  start?: number
-  count?: number
-  sort?: string
-
-  host?: string
-
-  // UUIDs or short UUIDs
-  uuids?: string[]
-}
-
-export interface VideoPlaylistsSearchQueryAfterSanitize extends VideoPlaylistsSearchQuery {
-  start: number
-  count: number
-  sort: string
-}
diff --git a/shared/models/search/videos-common-query.model.ts b/shared/models/search/videos-common-query.model.ts
deleted file mode 100644
index f783d7534..000000000
--- a/shared/models/search/videos-common-query.model.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { VideoPrivacy } from '@shared/models'
-import { VideoInclude } from '../videos/video-include.enum'
-import { BooleanBothQuery } from './boolean-both-query.model'
-
-// These query parameters can be used with any endpoint that list videos
-export interface VideosCommonQuery {
-  start?: number
-  count?: number
-  sort?: string
-
-  nsfw?: BooleanBothQuery
-
-  isLive?: boolean
-
-  isLocal?: boolean
-  include?: VideoInclude
-
-  categoryOneOf?: number[]
-
-  licenceOneOf?: number[]
-
-  languageOneOf?: string[]
-
-  privacyOneOf?: VideoPrivacy[]
-
-  tagsOneOf?: string[]
-  tagsAllOf?: string[]
-
-  hasHLSFiles?: boolean
-
-  hasWebtorrentFiles?: boolean // TODO: remove in v7
-  hasWebVideoFiles?: boolean
-
-  skipCount?: boolean
-
-  search?: string
-
-  excludeAlreadyWatched?: boolean
-}
-
-export interface VideosCommonQueryAfterSanitize extends VideosCommonQuery {
-  start: number
-  count: number
-  sort: string
-}
diff --git a/shared/models/search/videos-search-query.model.ts b/shared/models/search/videos-search-query.model.ts
deleted file mode 100644
index a5436879d..000000000
--- a/shared/models/search/videos-search-query.model.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { SearchTargetQuery } from './search-target-query.model'
-import { VideosCommonQuery } from './videos-common-query.model'
-
-export interface VideosSearchQuery extends SearchTargetQuery, VideosCommonQuery {
-  search?: string
-
-  host?: string
-
-  startDate?: string // ISO 8601
-  endDate?: string // ISO 8601
-
-  originallyPublishedStartDate?: string // ISO 8601
-  originallyPublishedEndDate?: string // ISO 8601
-
-  durationMin?: number // seconds
-  durationMax?: number // seconds
-
-  // UUIDs or short UUIDs
-  uuids?: string[]
-}
-
-export interface VideosSearchQueryAfterSanitize extends VideosSearchQuery {
-  start: number
-  count: number
-  sort: string
-}
diff --git a/shared/models/server/about.model.ts b/shared/models/server/about.model.ts
deleted file mode 100644
index 6d4ba63c4..000000000
--- a/shared/models/server/about.model.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export interface About {
-  instance: {
-    name: string
-    shortDescription: string
-    description: string
-    terms: string
-
-    codeOfConduct: string
-    hardwareInformation: string
-
-    creationReason: string
-    moderationInformation: string
-    administrator: string
-    maintenanceLifetime: string
-    businessModel: string
-
-    languages: string[]
-    categories: number[]
-  }
-}
diff --git a/shared/models/server/broadcast-message-level.type.ts b/shared/models/server/broadcast-message-level.type.ts
deleted file mode 100644
index bf43e18b5..000000000
--- a/shared/models/server/broadcast-message-level.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type BroadcastMessageLevel = 'info' | 'warning' | 'error'
diff --git a/shared/models/server/client-log-create.model.ts b/shared/models/server/client-log-create.model.ts
deleted file mode 100644
index c9dc65568..000000000
--- a/shared/models/server/client-log-create.model.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ClientLogLevel } from './client-log-level.type'
-
-export interface ClientLogCreate {
-  message: string
-  url: string
-  level: ClientLogLevel
-
-  stackTrace?: string
-  userAgent?: string
-  meta?: string
-}
diff --git a/shared/models/server/client-log-level.type.ts b/shared/models/server/client-log-level.type.ts
deleted file mode 100644
index 18dea2751..000000000
--- a/shared/models/server/client-log-level.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ClientLogLevel = 'warn' | 'error'
diff --git a/shared/models/server/contact-form.model.ts b/shared/models/server/contact-form.model.ts
deleted file mode 100644
index c23e6d1ba..000000000
--- a/shared/models/server/contact-form.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface ContactForm {
-  fromEmail: string
-  fromName: string
-  subject: string
-  body: string
-}
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
deleted file mode 100644
index 0dbb46fa8..000000000
--- a/shared/models/server/custom-config.model.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-import { NSFWPolicyType } from '../videos/nsfw-policy.type'
-import { BroadcastMessageLevel } from './broadcast-message-level.type'
-
-export type ConfigResolutions = {
-  '144p': boolean
-  '240p': boolean
-  '360p': boolean
-  '480p': boolean
-  '720p': boolean
-  '1080p': boolean
-  '1440p': boolean
-  '2160p': boolean
-}
-
-export interface CustomConfig {
-  instance: {
-    name: string
-    shortDescription: string
-    description: string
-    terms: string
-    codeOfConduct: string
-
-    creationReason: string
-    moderationInformation: string
-    administrator: string
-    maintenanceLifetime: string
-    businessModel: string
-    hardwareInformation: string
-
-    languages: string[]
-    categories: number[]
-
-    isNSFW: boolean
-    defaultNSFWPolicy: NSFWPolicyType
-
-    defaultClientRoute: string
-
-    customizations: {
-      javascript?: string
-      css?: string
-    }
-  }
-
-  theme: {
-    default: string
-  }
-
-  services: {
-    twitter: {
-      username: string
-      whitelisted: boolean
-    }
-  }
-
-  client: {
-    videos: {
-      miniature: {
-        preferAuthorDisplayName: boolean
-      }
-    }
-
-    menu: {
-      login: {
-        redirectOnSingleExternalAuth: boolean
-      }
-    }
-  }
-
-  cache: {
-    previews: {
-      size: number
-    }
-
-    captions: {
-      size: number
-    }
-
-    torrents: {
-      size: number
-    }
-
-    storyboards: {
-      size: number
-    }
-  }
-
-  signup: {
-    enabled: boolean
-    limit: number
-    requiresApproval: boolean
-    requiresEmailVerification: boolean
-    minimumAge: number
-  }
-
-  admin: {
-    email: string
-  }
-
-  contactForm: {
-    enabled: boolean
-  }
-
-  user: {
-    history: {
-      videos: {
-        enabled: boolean
-      }
-    }
-    videoQuota: number
-    videoQuotaDaily: number
-  }
-
-  videoChannels: {
-    maxPerUser: number
-  }
-
-  transcoding: {
-    enabled: boolean
-
-    allowAdditionalExtensions: boolean
-    allowAudioFiles: boolean
-
-    remoteRunners: {
-      enabled: boolean
-    }
-
-    threads: number
-    concurrency: number
-
-    profile: string
-
-    resolutions: ConfigResolutions & { '0p': boolean }
-
-    alwaysTranscodeOriginalResolution: boolean
-
-    webVideos: {
-      enabled: boolean
-    }
-
-    hls: {
-      enabled: boolean
-    }
-  }
-
-  live: {
-    enabled: boolean
-
-    allowReplay: boolean
-
-    latencySetting: {
-      enabled: boolean
-    }
-
-    maxDuration: number
-    maxInstanceLives: number
-    maxUserLives: number
-
-    transcoding: {
-      enabled: boolean
-      remoteRunners: {
-        enabled: boolean
-      }
-      threads: number
-      profile: string
-      resolutions: ConfigResolutions
-      alwaysTranscodeOriginalResolution: boolean
-    }
-  }
-
-  videoStudio: {
-    enabled: boolean
-
-    remoteRunners: {
-      enabled: boolean
-    }
-  }
-
-  videoFile: {
-    update: {
-      enabled: boolean
-    }
-  }
-
-  import: {
-    videos: {
-      concurrency: number
-
-      http: {
-        enabled: boolean
-      }
-      torrent: {
-        enabled: boolean
-      }
-    }
-    videoChannelSynchronization: {
-      enabled: boolean
-      maxPerUser: number
-    }
-  }
-
-  trending: {
-    videos: {
-      algorithms: {
-        enabled: string[]
-        default: string
-      }
-    }
-  }
-
-  autoBlacklist: {
-    videos: {
-      ofUsers: {
-        enabled: boolean
-      }
-    }
-  }
-
-  followers: {
-    instance: {
-      enabled: boolean
-      manualApproval: boolean
-    }
-  }
-
-  followings: {
-    instance: {
-      autoFollowBack: {
-        enabled: boolean
-      }
-
-      autoFollowIndex: {
-        enabled: boolean
-        indexUrl: string
-      }
-    }
-  }
-
-  broadcastMessage: {
-    enabled: boolean
-    message: string
-    level: BroadcastMessageLevel
-    dismissable: boolean
-  }
-
-  search: {
-    remoteUri: {
-      users: boolean
-      anonymous: boolean
-    }
-
-    searchIndex: {
-      enabled: boolean
-      url: string
-      disableLocalSearch: boolean
-      isDefaultSearch: boolean
-    }
-  }
-
-}
diff --git a/shared/models/server/debug.model.ts b/shared/models/server/debug.model.ts
deleted file mode 100644
index 41f2109af..000000000
--- a/shared/models/server/debug.model.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface Debug {
-  ip: string
-  activityPubMessagesWaiting: number
-}
-
-export interface SendDebugCommand {
-  command: 'remove-dandling-resumable-uploads'
-  | 'process-video-views-buffer'
-  | 'process-video-viewers'
-  | 'process-video-channel-sync-latest'
-  | 'process-update-videos-scheduler'
-}
diff --git a/shared/models/server/emailer.model.ts b/shared/models/server/emailer.model.ts
deleted file mode 100644
index 39512d306..000000000
--- a/shared/models/server/emailer.model.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-type From = string | { name?: string, address: string }
-
-interface Base extends Partial<SendEmailDefaultMessageOptions> {
-  to: string[] | string
-}
-
-interface MailTemplate extends Base {
-  template: string
-  locals?: { [key: string]: any }
-  text?: undefined
-}
-
-interface MailText extends Base {
-  text: string
-
-  locals?: Partial<SendEmailDefaultLocalsOptions> & {
-    title?: string
-    action?: {
-      url: string
-      text: string
-    }
-  }
-}
-
-interface SendEmailDefaultLocalsOptions {
-  instanceName: string
-  text: string
-  subject: string
-}
-
-interface SendEmailDefaultMessageOptions {
-  to: string[] | string
-  from: From
-  subject: string
-  replyTo: string
-}
-
-export type SendEmailDefaultOptions = {
-  template: 'common'
-
-  message: SendEmailDefaultMessageOptions
-
-  locals: SendEmailDefaultLocalsOptions & {
-    WEBSERVER: any
-    EMAIL: any
-  }
-}
-
-export type SendEmailOptions = MailTemplate | MailText
diff --git a/shared/models/server/index.ts b/shared/models/server/index.ts
deleted file mode 100644
index a9136f3d4..000000000
--- a/shared/models/server/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export * from './about.model'
-export * from './broadcast-message-level.type'
-export * from './client-log-create.model'
-export * from './client-log-level.type'
-export * from './contact-form.model'
-export * from './custom-config.model'
-export * from './debug.model'
-export * from './emailer.model'
-export * from './job.model'
-export * from './peertube-problem-document.model'
-export * from './server-config.model'
-export * from './server-debug.model'
-export * from './server-error-code.enum'
-export * from './server-follow-create.model'
-export * from './server-log-level.type'
-export * from './server-stats.model'
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
deleted file mode 100644
index c14806dab..000000000
--- a/shared/models/server/job.model.ts
+++ /dev/null
@@ -1,304 +0,0 @@
-import { ContextType } from '../activitypub/context'
-import { VideoState } from '../videos'
-import { VideoResolution } from '../videos/file/video-resolution.enum'
-import { VideoStudioTaskCut } from '../videos/studio'
-import { SendEmailOptions } from './emailer.model'
-
-export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed' | 'paused' | 'waiting-children'
-
-export type JobType =
-  | 'activitypub-cleaner'
-  | 'activitypub-follow'
-  | 'activitypub-http-broadcast-parallel'
-  | 'activitypub-http-broadcast'
-  | 'activitypub-http-fetcher'
-  | 'activitypub-http-unicast'
-  | 'activitypub-refresher'
-  | 'actor-keys'
-  | 'after-video-channel-import'
-  | 'email'
-  | 'federate-video'
-  | 'transcoding-job-builder'
-  | 'manage-video-torrent'
-  | 'move-to-object-storage'
-  | 'notify'
-  | 'video-channel-import'
-  | 'video-file-import'
-  | 'video-import'
-  | 'video-live-ending'
-  | 'video-redundancy'
-  | 'video-studio-edition'
-  | 'video-transcoding'
-  | 'videos-views-stats'
-  | 'generate-video-storyboard'
-
-export interface Job {
-  id: number | string
-  state: JobState | 'unknown'
-  type: JobType
-  data: any
-  priority: number
-  progress: number
-  error: any
-  createdAt: Date | string
-  finishedOn: Date | string
-  processedOn: Date | string
-
-  parent?: {
-    id: string
-  }
-}
-
-export type ActivitypubHttpBroadcastPayload = {
-  uris: string[]
-  contextType: ContextType
-  body: any
-  signatureActorId?: number
-}
-
-export type ActivitypubFollowPayload = {
-  followerActorId: number
-  name: string
-  host: string
-  isAutoFollow?: boolean
-  assertIsChannel?: boolean
-}
-
-export type FetchType = 'activity' | 'video-shares' | 'video-comments' | 'account-playlists'
-export type ActivitypubHttpFetcherPayload = {
-  uri: string
-  type: FetchType
-  videoId?: number
-}
-
-export type ActivitypubHttpUnicastPayload = {
-  uri: string
-  contextType: ContextType
-  signatureActorId?: number
-  body: object
-}
-
-export type RefreshPayload = {
-  type: 'video' | 'video-playlist' | 'actor'
-  url: string
-}
-
-export type EmailPayload = SendEmailOptions
-
-export type VideoFileImportPayload = {
-  videoUUID: string
-  filePath: string
-}
-
-// ---------------------------------------------------------------------------
-
-export type VideoImportTorrentPayloadType = 'magnet-uri' | 'torrent-file'
-export type VideoImportYoutubeDLPayloadType = 'youtube-dl'
-
-export interface VideoImportYoutubeDLPayload {
-  type: VideoImportYoutubeDLPayloadType
-  videoImportId: number
-
-  fileExt?: string
-}
-
-export interface VideoImportTorrentPayload {
-  type: VideoImportTorrentPayloadType
-  videoImportId: number
-}
-
-export type VideoImportPayload = (VideoImportYoutubeDLPayload | VideoImportTorrentPayload) & {
-  preventException: boolean
-}
-
-export interface VideoImportPreventExceptionResult {
-  resultType: 'success' | 'error'
-}
-
-// ---------------------------------------------------------------------------
-
-export type VideoRedundancyPayload = {
-  videoId: number
-}
-
-export type ManageVideoTorrentPayload =
-  {
-    action: 'create'
-    videoId: number
-    videoFileId: number
-  } | {
-    action: 'update-metadata'
-
-    videoId?: number
-    streamingPlaylistId?: number
-
-    videoFileId: number
-  }
-
-// Video transcoding payloads
-
-interface BaseTranscodingPayload {
-  videoUUID: string
-  isNewVideo?: boolean
-}
-
-export interface HLSTranscodingPayload extends BaseTranscodingPayload {
-  type: 'new-resolution-to-hls'
-  resolution: VideoResolution
-  fps: number
-  copyCodecs: boolean
-
-  deleteWebVideoFiles: boolean
-}
-
-export interface NewWebVideoResolutionTranscodingPayload extends BaseTranscodingPayload {
-  type: 'new-resolution-to-web-video'
-  resolution: VideoResolution
-  fps: number
-}
-
-export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload {
-  type: 'merge-audio-to-web-video'
-
-  resolution: VideoResolution
-  fps: number
-
-  hasChildren: boolean
-}
-
-export interface OptimizeTranscodingPayload extends BaseTranscodingPayload {
-  type: 'optimize-to-web-video'
-
-  quickTranscode: boolean
-
-  hasChildren: boolean
-}
-
-export type VideoTranscodingPayload =
-  HLSTranscodingPayload
-  | NewWebVideoResolutionTranscodingPayload
-  | OptimizeTranscodingPayload
-  | MergeAudioTranscodingPayload
-
-export interface VideoLiveEndingPayload {
-  videoId: number
-  publishedAt: string
-  liveSessionId: number
-  streamingPlaylistId: number
-
-  replayDirectory?: string
-}
-
-export interface ActorKeysPayload {
-  actorId: number
-}
-
-export interface DeleteResumableUploadMetaFilePayload {
-  filepath: string
-}
-
-export interface MoveObjectStoragePayload {
-  videoUUID: string
-  isNewVideo: boolean
-  previousVideoState: VideoState
-}
-
-export type VideoStudioTaskCutPayload = VideoStudioTaskCut
-
-export type VideoStudioTaskIntroPayload = {
-  name: 'add-intro'
-
-  options: {
-    file: string
-  }
-}
-
-export type VideoStudioTaskOutroPayload = {
-  name: 'add-outro'
-
-  options: {
-    file: string
-  }
-}
-
-export type VideoStudioTaskWatermarkPayload = {
-  name: 'add-watermark'
-
-  options: {
-    file: string
-
-    watermarkSizeRatio: number
-    horitonzalMarginRatio: number
-    verticalMarginRatio: number
-  }
-}
-
-export type VideoStudioTaskPayload =
-  VideoStudioTaskCutPayload |
-  VideoStudioTaskIntroPayload |
-  VideoStudioTaskOutroPayload |
-  VideoStudioTaskWatermarkPayload
-
-export interface VideoStudioEditionPayload {
-  videoUUID: string
-  tasks: VideoStudioTaskPayload[]
-}
-
-// ---------------------------------------------------------------------------
-
-export interface VideoChannelImportPayload {
-  externalChannelUrl: string
-  videoChannelId: number
-
-  partOfChannelSyncId?: number
-}
-
-export interface AfterVideoChannelImportPayload {
-  channelSyncId: number
-}
-
-// ---------------------------------------------------------------------------
-
-export type NotifyPayload =
-  {
-    action: 'new-video'
-    videoUUID: string
-  }
-
-// ---------------------------------------------------------------------------
-
-export interface FederateVideoPayload {
-  videoUUID: string
-  isNewVideo: boolean
-}
-
-// ---------------------------------------------------------------------------
-
-export interface TranscodingJobBuilderPayload {
-  videoUUID: string
-
-  optimizeJob?: {
-    isNewVideo: boolean
-  }
-
-  // Array of jobs to create
-  jobs?: {
-    type: 'video-transcoding'
-    payload: VideoTranscodingPayload
-    priority?: number
-  }[]
-
-  // Array of sequential jobs to create
-  sequentialJobs?: {
-    type: 'video-transcoding'
-    payload: VideoTranscodingPayload
-    priority?: number
-  }[][]
-}
-
-// ---------------------------------------------------------------------------
-
-export interface GenerateStoryboardPayload {
-  videoUUID: string
-  federate: boolean
-}
diff --git a/shared/models/server/peertube-problem-document.model.ts b/shared/models/server/peertube-problem-document.model.ts
deleted file mode 100644
index 83d9cea9b..000000000
--- a/shared/models/server/peertube-problem-document.model.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { HttpStatusCode } from '../../models'
-import { OAuth2ErrorCode, ServerErrorCode } from './server-error-code.enum'
-
-export interface PeerTubeProblemDocumentData {
-  'invalid-params'?: Record<string, object>
-
-  originUrl?: string
-
-  keyId?: string
-
-  targetUrl?: string
-
-  actorUrl?: string
-
-  // Feeds
-  format?: string
-  url?: string
-}
-
-export interface PeerTubeProblemDocument extends PeerTubeProblemDocumentData {
-  type: string
-  title: string
-
-  detail: string
-  // Compat PeerTube <= 3.2
-  error: string
-
-  status: HttpStatusCode
-
-  docs?: string
-  code?: ServerErrorCode | OAuth2ErrorCode
-}
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
deleted file mode 100644
index 3f61e93b5..000000000
--- a/shared/models/server/server-config.model.ts
+++ /dev/null
@@ -1,305 +0,0 @@
-import { ClientScriptJSON } from '../plugins/plugin-package-json.model'
-import { NSFWPolicyType } from '../videos/nsfw-policy.type'
-import { VideoPrivacy } from '../videos/video-privacy.enum'
-import { BroadcastMessageLevel } from './broadcast-message-level.type'
-
-export interface ServerConfigPlugin {
-  name: string
-  npmName: string
-  version: string
-  description: string
-  clientScripts: { [name: string]: ClientScriptJSON }
-}
-
-export interface ServerConfigTheme extends ServerConfigPlugin {
-  css: string[]
-}
-
-export interface RegisteredExternalAuthConfig {
-  npmName: string
-  name: string
-  version: string
-  authName: string
-  authDisplayName: string
-}
-
-export interface RegisteredIdAndPassAuthConfig {
-  npmName: string
-  name: string
-  version: string
-  authName: string
-  weight: number
-}
-
-export interface ServerConfig {
-  serverVersion: string
-  serverCommit?: string
-
-  client: {
-    videos: {
-      miniature: {
-        displayAuthorAvatar: boolean
-        preferAuthorDisplayName: boolean
-      }
-      resumableUpload: {
-        maxChunkSize: number
-      }
-    }
-
-    menu: {
-      login: {
-        redirectOnSingleExternalAuth: boolean
-      }
-    }
-  }
-
-  defaults: {
-    publish: {
-      downloadEnabled: boolean
-      commentsEnabled: boolean
-      privacy: VideoPrivacy
-      licence: number
-    }
-
-    p2p: {
-      webapp: {
-        enabled: boolean
-      }
-
-      embed: {
-        enabled: boolean
-      }
-    }
-  }
-
-  webadmin: {
-    configuration: {
-      edition: {
-        allowed: boolean
-      }
-    }
-  }
-
-  instance: {
-    name: string
-    shortDescription: string
-    isNSFW: boolean
-    defaultNSFWPolicy: NSFWPolicyType
-    defaultClientRoute: string
-    customizations: {
-      javascript: string
-      css: string
-    }
-  }
-
-  search: {
-    remoteUri: {
-      users: boolean
-      anonymous: boolean
-    }
-
-    searchIndex: {
-      enabled: boolean
-      url: string
-      disableLocalSearch: boolean
-      isDefaultSearch: boolean
-    }
-  }
-
-  plugin: {
-    registered: ServerConfigPlugin[]
-
-    registeredExternalAuths: RegisteredExternalAuthConfig[]
-
-    registeredIdAndPassAuths: RegisteredIdAndPassAuthConfig[]
-  }
-
-  theme: {
-    registered: ServerConfigTheme[]
-    default: string
-  }
-
-  email: {
-    enabled: boolean
-  }
-
-  contactForm: {
-    enabled: boolean
-  }
-
-  signup: {
-    allowed: boolean
-    allowedForCurrentIP: boolean
-    requiresEmailVerification: boolean
-    requiresApproval: boolean
-    minimumAge: number
-  }
-
-  transcoding: {
-    hls: {
-      enabled: boolean
-    }
-
-    web_videos: {
-      enabled: boolean
-    }
-
-    enabledResolutions: number[]
-
-    profile: string
-    availableProfiles: string[]
-
-    remoteRunners: {
-      enabled: boolean
-    }
-  }
-
-  live: {
-    enabled: boolean
-
-    allowReplay: boolean
-    latencySetting: {
-      enabled: boolean
-    }
-
-    maxDuration: number
-    maxInstanceLives: number
-    maxUserLives: number
-
-    transcoding: {
-      enabled: boolean
-
-      remoteRunners: {
-        enabled: boolean
-      }
-
-      enabledResolutions: number[]
-
-      profile: string
-      availableProfiles: string[]
-    }
-
-    rtmp: {
-      port: number
-    }
-  }
-
-  videoStudio: {
-    enabled: boolean
-
-    remoteRunners: {
-      enabled: boolean
-    }
-  }
-
-  videoFile: {
-    update: {
-      enabled: boolean
-    }
-  }
-
-  import: {
-    videos: {
-      http: {
-        enabled: boolean
-      }
-      torrent: {
-        enabled: boolean
-      }
-    }
-    videoChannelSynchronization: {
-      enabled: boolean
-    }
-  }
-
-  autoBlacklist: {
-    videos: {
-      ofUsers: {
-        enabled: boolean
-      }
-    }
-  }
-
-  avatar: {
-    file: {
-      size: {
-        max: number
-      }
-      extensions: string[]
-    }
-  }
-
-  banner: {
-    file: {
-      size: {
-        max: number
-      }
-      extensions: string[]
-    }
-  }
-
-  video: {
-    image: {
-      size: {
-        max: number
-      }
-      extensions: string[]
-    }
-    file: {
-      extensions: string[]
-    }
-  }
-
-  videoCaption: {
-    file: {
-      size: {
-        max: number
-      }
-      extensions: string[]
-    }
-  }
-
-  user: {
-    videoQuota: number
-    videoQuotaDaily: number
-  }
-
-  videoChannels: {
-    maxPerUser: number
-  }
-
-  trending: {
-    videos: {
-      intervalDays: number
-      algorithms: {
-        enabled: string[]
-        default: string
-      }
-    }
-  }
-
-  tracker: {
-    enabled: boolean
-  }
-
-  followings: {
-    instance: {
-      autoFollowIndex: {
-        indexUrl: string
-      }
-    }
-  }
-
-  broadcastMessage: {
-    enabled: boolean
-    message: string
-    level: BroadcastMessageLevel
-    dismissable: boolean
-  }
-
-  homepage: {
-    enabled: boolean
-  }
-}
-
-export type HTMLServerConfig = Omit<ServerConfig, 'signup'>
diff --git a/shared/models/server/server-debug.model.ts b/shared/models/server/server-debug.model.ts
deleted file mode 100644
index 4b731bb90..000000000
--- a/shared/models/server/server-debug.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface ServerDebug {
-  ip: string
-  activityPubMessagesWaiting: number
-}
diff --git a/shared/models/server/server-error-code.enum.ts b/shared/models/server/server-error-code.enum.ts
deleted file mode 100644
index 583e8245f..000000000
--- a/shared/models/server/server-error-code.enum.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-export const enum ServerErrorCode {
-  /**
-   * The simplest form of payload too large: when the file size is over the
-   * global file size limit
-   */
-  MAX_FILE_SIZE_REACHED = 'max_file_size_reached',
-
-  /**
-   * The payload is too large for the user quota set
-   */
-  QUOTA_REACHED = 'quota_reached',
-
-  /**
-   * Error yielded upon trying to access a video that is not federated, nor can
-   * be. This may be due to: remote videos on instances that are not followed by
-   * yours, and with your instance disallowing unknown instances being accessed.
-   */
-  DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS = 'does_not_respect_follow_constraints',
-
-  LIVE_NOT_ENABLED = 'live_not_enabled',
-  LIVE_NOT_ALLOWING_REPLAY = 'live_not_allowing_replay',
-  LIVE_CONFLICTING_PERMANENT_AND_SAVE_REPLAY = 'live_conflicting_permanent_and_save_replay',
-  /**
-   * Pretty self-explanatory: the set maximum number of simultaneous lives was
-   * reached, and this error is typically there to inform the user trying to
-   * broadcast one.
-   */
-  MAX_INSTANCE_LIVES_LIMIT_REACHED = 'max_instance_lives_limit_reached',
-  /**
-   * Pretty self-explanatory: the set maximum number of simultaneous lives FOR
-   * THIS USER was reached, and this error is typically there to inform the user
-   * trying to broadcast one.
-   */
-  MAX_USER_LIVES_LIMIT_REACHED = 'max_user_lives_limit_reached',
-
-  /**
-   * A torrent should have at most one correct video file. Any more and we will
-   * not be able to choose automatically.
-   */
-  INCORRECT_FILES_IN_TORRENT = 'incorrect_files_in_torrent',
-
-  COMMENT_NOT_ASSOCIATED_TO_VIDEO = 'comment_not_associated_to_video',
-
-  MISSING_TWO_FACTOR = 'missing_two_factor',
-  INVALID_TWO_FACTOR = 'invalid_two_factor',
-
-  ACCOUNT_WAITING_FOR_APPROVAL = 'account_waiting_for_approval',
-  ACCOUNT_APPROVAL_REJECTED = 'account_approval_rejected',
-
-  RUNNER_JOB_NOT_IN_PROCESSING_STATE = 'runner_job_not_in_processing_state',
-  RUNNER_JOB_NOT_IN_PENDING_STATE = 'runner_job_not_in_pending_state',
-  UNKNOWN_RUNNER_TOKEN = 'unknown_runner_token',
-
-  VIDEO_REQUIRES_PASSWORD = 'video_requires_password',
-  INCORRECT_VIDEO_PASSWORD = 'incorrect_video_password',
-
-  VIDEO_ALREADY_BEING_TRANSCODED = 'video_already_being_transcoded'
-}
-
-/**
- * oauthjs/oauth2-server error codes
- * @see https://datatracker.ietf.org/doc/html/rfc6749#section-5.2
- **/
-export const enum OAuth2ErrorCode {
-  /**
-   * The provided authorization grant (e.g., authorization code, resource owner
-   * credentials) or refresh token is invalid, expired, revoked, does not match
-   * the redirection URI used in the authorization request, or was issued to
-   * another client.
-   *
-   * @see https://github.com/oauthjs/node-oauth2-server/blob/master/lib/errors/invalid-grant-error.js
-   */
-  INVALID_GRANT = 'invalid_grant',
-
-  /**
-   * Client authentication failed (e.g., unknown client, no client authentication
-   * included, or unsupported authentication method).
-   *
-   * @see https://github.com/oauthjs/node-oauth2-server/blob/master/lib/errors/invalid-client-error.js
-   */
-  INVALID_CLIENT = 'invalid_client',
-
-  /**
-   * The access token provided is expired, revoked, malformed, or invalid for other reasons
-   *
-   * @see https://github.com/oauthjs/node-oauth2-server/blob/master/lib/errors/invalid-token-error.js
-   */
-  INVALID_TOKEN = 'invalid_token'
-}
diff --git a/shared/models/server/server-follow-create.model.ts b/shared/models/server/server-follow-create.model.ts
deleted file mode 100644
index 3f90c7d6f..000000000
--- a/shared/models/server/server-follow-create.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface ServerFollowCreate {
-  hosts?: string[]
-  handles?: string[]
-}
diff --git a/shared/models/server/server-log-level.type.ts b/shared/models/server/server-log-level.type.ts
deleted file mode 100644
index f0f31a4ae..000000000
--- a/shared/models/server/server-log-level.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ServerLogLevel = 'debug' | 'info' | 'warn' | 'error' | 'audit'
diff --git a/shared/models/server/server-stats.model.ts b/shared/models/server/server-stats.model.ts
deleted file mode 100644
index 82f5a737f..000000000
--- a/shared/models/server/server-stats.model.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { ActivityType } from '../activitypub'
-import { VideoRedundancyStrategyWithManual } from '../redundancy'
-
-type ActivityPubMessagesSuccess = Record<`totalActivityPub${ActivityType}MessagesSuccesses`, number>
-type ActivityPubMessagesErrors = Record<`totalActivityPub${ActivityType}MessagesErrors`, number>
-
-export interface ServerStats extends ActivityPubMessagesSuccess, ActivityPubMessagesErrors {
-  totalUsers: number
-  totalDailyActiveUsers: number
-  totalWeeklyActiveUsers: number
-  totalMonthlyActiveUsers: number
-
-  totalLocalVideos: number
-  totalLocalVideoViews: number
-  totalLocalVideoComments: number
-  totalLocalVideoFilesSize: number
-
-  totalVideos: number
-  totalVideoComments: number
-
-  totalLocalVideoChannels: number
-  totalLocalDailyActiveVideoChannels: number
-  totalLocalWeeklyActiveVideoChannels: number
-  totalLocalMonthlyActiveVideoChannels: number
-
-  totalLocalPlaylists: number
-
-  totalInstanceFollowers: number
-  totalInstanceFollowing: number
-
-  videosRedundancy: VideosRedundancyStats[]
-
-  totalActivityPubMessagesProcessed: number
-  totalActivityPubMessagesSuccesses: number
-  totalActivityPubMessagesErrors: number
-
-  activityPubMessagesProcessedPerSecond: number
-  totalActivityPubMessagesWaiting: number
-}
-
-export interface VideosRedundancyStats {
-  strategy: VideoRedundancyStrategyWithManual
-  totalSize: number
-  totalUsed: number
-  totalVideoFiles: number
-  totalVideos: number
-}
diff --git a/shared/models/tokens/index.ts b/shared/models/tokens/index.ts
deleted file mode 100644
index fe130f153..000000000
--- a/shared/models/tokens/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './oauth-client-local.model'
diff --git a/shared/models/tokens/oauth-client-local.model.ts b/shared/models/tokens/oauth-client-local.model.ts
deleted file mode 100644
index 0c6ce6c5d..000000000
--- a/shared/models/tokens/oauth-client-local.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface OAuthClientLocal {
-  client_id: string
-  client_secret: string
-}
diff --git a/shared/models/users/index.ts b/shared/models/users/index.ts
deleted file mode 100644
index 4a050c870..000000000
--- a/shared/models/users/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export * from './registration'
-export * from './two-factor-enable-result.model'
-export * from './user-create-result.model'
-export * from './user-create.model'
-export * from './user-flag.model'
-export * from './user-login.model'
-export * from './user-notification-setting.model'
-export * from './user-notification.model'
-export * from './user-refresh-token.model'
-export * from './user-right.enum'
-export * from './user-role'
-export * from './user-scoped-token'
-export * from './user-update-me.model'
-export * from './user-update.model'
-export * from './user-video-quota.model'
-export * from './user.model'
diff --git a/shared/models/users/registration/index.ts b/shared/models/users/registration/index.ts
deleted file mode 100644
index 593740c4f..000000000
--- a/shared/models/users/registration/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './user-register.model'
-export * from './user-registration-request.model'
-export * from './user-registration-state.model'
-export * from './user-registration-update-state.model'
-export * from './user-registration.model'
diff --git a/shared/models/users/registration/user-register.model.ts b/shared/models/users/registration/user-register.model.ts
deleted file mode 100644
index cf9a43a67..000000000
--- a/shared/models/users/registration/user-register.model.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface UserRegister {
-  username: string
-  password: string
-  email: string
-
-  displayName?: string
-
-  channel?: {
-    name: string
-    displayName: string
-  }
-}
diff --git a/shared/models/users/registration/user-registration-request.model.ts b/shared/models/users/registration/user-registration-request.model.ts
deleted file mode 100644
index 6c38817e0..000000000
--- a/shared/models/users/registration/user-registration-request.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { UserRegister } from './user-register.model'
-
-export interface UserRegistrationRequest extends UserRegister {
-  registrationReason: string
-}
diff --git a/shared/models/users/registration/user-registration-state.model.ts b/shared/models/users/registration/user-registration-state.model.ts
deleted file mode 100644
index e4c835f78..000000000
--- a/shared/models/users/registration/user-registration-state.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const enum UserRegistrationState {
-  PENDING = 1,
-  REJECTED = 2,
-  ACCEPTED = 3
-}
diff --git a/shared/models/users/registration/user-registration-update-state.model.ts b/shared/models/users/registration/user-registration-update-state.model.ts
deleted file mode 100644
index a1740dcca..000000000
--- a/shared/models/users/registration/user-registration-update-state.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface UserRegistrationUpdateState {
-  moderationResponse: string
-  preventEmailDelivery?: boolean
-}
diff --git a/shared/models/users/registration/user-registration.model.ts b/shared/models/users/registration/user-registration.model.ts
deleted file mode 100644
index 0d74dc28b..000000000
--- a/shared/models/users/registration/user-registration.model.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { UserRegistrationState } from './user-registration-state.model'
-
-export interface UserRegistration {
-  id: number
-
-  state: {
-    id: UserRegistrationState
-    label: string
-  }
-
-  registrationReason: string
-  moderationResponse: string
-
-  username: string
-  email: string
-  emailVerified: boolean
-
-  accountDisplayName: string
-
-  channelHandle: string
-  channelDisplayName: string
-
-  createdAt: Date
-  updatedAt: Date
-
-  user?: {
-    id: number
-  }
-}
diff --git a/shared/models/users/two-factor-enable-result.model.ts b/shared/models/users/two-factor-enable-result.model.ts
deleted file mode 100644
index 1fc801f0a..000000000
--- a/shared/models/users/two-factor-enable-result.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface TwoFactorEnableResult {
-  otpRequest: {
-    requestToken: string
-    secret: string
-    uri: string
-  }
-}
diff --git a/shared/models/users/user-create-result.model.ts b/shared/models/users/user-create-result.model.ts
deleted file mode 100644
index 835b241ed..000000000
--- a/shared/models/users/user-create-result.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface UserCreateResult {
-  id: number
-
-  account: {
-    id: number
-  }
-}
diff --git a/shared/models/users/user-create.model.ts b/shared/models/users/user-create.model.ts
deleted file mode 100644
index ddc71dd59..000000000
--- a/shared/models/users/user-create.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { UserRole } from './user-role'
-import { UserAdminFlag } from './user-flag.model'
-
-export interface UserCreate {
-  username: string
-  password: string
-  email: string
-  videoQuota: number
-  videoQuotaDaily: number
-  role: UserRole
-  adminFlags?: UserAdminFlag
-  channelName?: string
-}
diff --git a/shared/models/users/user-flag.model.ts b/shared/models/users/user-flag.model.ts
deleted file mode 100644
index b791a1263..000000000
--- a/shared/models/users/user-flag.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const enum UserAdminFlag {
-  NONE = 0,
-  BYPASS_VIDEO_AUTO_BLACKLIST = 1 << 0
-}
diff --git a/shared/models/users/user-login.model.ts b/shared/models/users/user-login.model.ts
deleted file mode 100644
index 1e85ab30b..000000000
--- a/shared/models/users/user-login.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface UserLogin {
-  access_token: string
-  refresh_token: string
-  token_type: string
-}
diff --git a/shared/models/users/user-notification-setting.model.ts b/shared/models/users/user-notification-setting.model.ts
deleted file mode 100644
index 278a05e7a..000000000
--- a/shared/models/users/user-notification-setting.model.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-export const enum UserNotificationSettingValue {
-  NONE = 0,
-  WEB = 1 << 0,
-  EMAIL = 1 << 1
-}
-
-export interface UserNotificationSetting {
-  abuseAsModerator: UserNotificationSettingValue
-  videoAutoBlacklistAsModerator: UserNotificationSettingValue
-  newUserRegistration: UserNotificationSettingValue
-
-  newVideoFromSubscription: UserNotificationSettingValue
-
-  blacklistOnMyVideo: UserNotificationSettingValue
-  myVideoPublished: UserNotificationSettingValue
-  myVideoImportFinished: UserNotificationSettingValue
-
-  commentMention: UserNotificationSettingValue
-  newCommentOnMyVideo: UserNotificationSettingValue
-
-  newFollow: UserNotificationSettingValue
-  newInstanceFollower: UserNotificationSettingValue
-  autoInstanceFollowing: UserNotificationSettingValue
-
-  abuseStateChange: UserNotificationSettingValue
-  abuseNewMessage: UserNotificationSettingValue
-
-  newPeerTubeVersion: UserNotificationSettingValue
-  newPluginVersion: UserNotificationSettingValue
-
-  myVideoStudioEditionFinished: UserNotificationSettingValue
-}
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts
deleted file mode 100644
index 294c921bd..000000000
--- a/shared/models/users/user-notification.model.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { FollowState } from '../actors'
-import { AbuseState } from '../moderation'
-import { PluginType } from '../plugins'
-
-export const enum UserNotificationType {
-  NEW_VIDEO_FROM_SUBSCRIPTION = 1,
-  NEW_COMMENT_ON_MY_VIDEO = 2,
-  NEW_ABUSE_FOR_MODERATORS = 3,
-
-  BLACKLIST_ON_MY_VIDEO = 4,
-  UNBLACKLIST_ON_MY_VIDEO = 5,
-
-  MY_VIDEO_PUBLISHED = 6,
-
-  MY_VIDEO_IMPORT_SUCCESS = 7,
-  MY_VIDEO_IMPORT_ERROR = 8,
-
-  NEW_USER_REGISTRATION = 9,
-  NEW_FOLLOW = 10,
-  COMMENT_MENTION = 11,
-
-  VIDEO_AUTO_BLACKLIST_FOR_MODERATORS = 12,
-
-  NEW_INSTANCE_FOLLOWER = 13,
-
-  AUTO_INSTANCE_FOLLOWING = 14,
-
-  ABUSE_STATE_CHANGE = 15,
-
-  ABUSE_NEW_MESSAGE = 16,
-
-  NEW_PLUGIN_VERSION = 17,
-  NEW_PEERTUBE_VERSION = 18,
-
-  MY_VIDEO_STUDIO_EDITION_FINISHED = 19,
-
-  NEW_USER_REGISTRATION_REQUEST = 20
-}
-
-export interface VideoInfo {
-  id: number
-  uuid: string
-  shortUUID: string
-  name: string
-}
-
-export interface AvatarInfo {
-  width: number
-  path: string
-}
-
-export interface ActorInfo {
-  id: number
-  displayName: string
-  name: string
-  host: string
-
-  avatars: AvatarInfo[]
-  avatar: AvatarInfo
-}
-
-export interface UserNotification {
-  id: number
-  type: UserNotificationType
-  read: boolean
-
-  video?: VideoInfo & {
-    channel: ActorInfo
-  }
-
-  videoImport?: {
-    id: number
-    video?: VideoInfo
-    torrentName?: string
-    magnetUri?: string
-    targetUrl?: string
-  }
-
-  comment?: {
-    id: number
-    threadId: number
-    account: ActorInfo
-    video: VideoInfo
-  }
-
-  abuse?: {
-    id: number
-    state: AbuseState
-
-    video?: VideoInfo
-
-    comment?: {
-      threadId: number
-
-      video: VideoInfo
-    }
-
-    account?: ActorInfo
-  }
-
-  videoBlacklist?: {
-    id: number
-    video: VideoInfo
-  }
-
-  account?: ActorInfo
-
-  actorFollow?: {
-    id: number
-    follower: ActorInfo
-    state: FollowState
-
-    following: {
-      type: 'account' | 'channel' | 'instance'
-      name: string
-      displayName: string
-      host: string
-    }
-  }
-
-  plugin?: {
-    name: string
-    type: PluginType
-    latestVersion: string
-  }
-
-  peertube?: {
-    latestVersion: string
-  }
-
-  registration?: {
-    id: number
-    username: string
-  }
-
-  createdAt: string
-  updatedAt: string
-}
diff --git a/shared/models/users/user-refresh-token.model.ts b/shared/models/users/user-refresh-token.model.ts
deleted file mode 100644
index f528dd961..000000000
--- a/shared/models/users/user-refresh-token.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface UserRefreshToken {
-  access_token: string
-  refresh_token: string
-}
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts
deleted file mode 100644
index a5a770b75..000000000
--- a/shared/models/users/user-right.enum.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-export const enum UserRight {
-  ALL = 0,
-
-  MANAGE_USERS = 1,
-
-  MANAGE_SERVER_FOLLOW = 2,
-
-  MANAGE_LOGS = 3,
-
-  MANAGE_DEBUG = 4,
-
-  MANAGE_SERVER_REDUNDANCY = 5,
-
-  MANAGE_ABUSES = 6,
-
-  MANAGE_JOBS = 7,
-
-  MANAGE_CONFIGURATION = 8,
-  MANAGE_INSTANCE_CUSTOM_PAGE = 9,
-
-  MANAGE_ACCOUNTS_BLOCKLIST = 10,
-  MANAGE_SERVERS_BLOCKLIST = 11,
-
-  MANAGE_VIDEO_BLACKLIST = 12,
-  MANAGE_ANY_VIDEO_CHANNEL = 13,
-
-  REMOVE_ANY_VIDEO = 14,
-  REMOVE_ANY_VIDEO_PLAYLIST = 15,
-  REMOVE_ANY_VIDEO_COMMENT = 16,
-
-  UPDATE_ANY_VIDEO = 17,
-  UPDATE_ANY_VIDEO_PLAYLIST = 18,
-
-  GET_ANY_LIVE = 19,
-  SEE_ALL_VIDEOS = 20,
-  SEE_ALL_COMMENTS = 21,
-  CHANGE_VIDEO_OWNERSHIP = 22,
-
-  MANAGE_PLUGINS = 23,
-
-  MANAGE_VIDEOS_REDUNDANCIES = 24,
-
-  MANAGE_VIDEO_FILES = 25,
-  RUN_VIDEO_TRANSCODING = 26,
-
-  MANAGE_VIDEO_IMPORTS = 27,
-
-  MANAGE_REGISTRATIONS = 28,
-
-  MANAGE_RUNNERS = 29
-}
diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts
deleted file mode 100644
index 687a2aa0d..000000000
--- a/shared/models/users/user-role.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Keep the order
-export const enum UserRole {
-  ADMINISTRATOR = 0,
-  MODERATOR = 1,
-  USER = 2
-}
diff --git a/shared/models/users/user-scoped-token.ts b/shared/models/users/user-scoped-token.ts
deleted file mode 100644
index f9d9b0a8b..000000000
--- a/shared/models/users/user-scoped-token.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type ScopedTokenType = 'feedToken'
-
-export type ScopedToken = {
-  feedToken: string
-}
diff --git a/shared/models/users/user-update-me.model.ts b/shared/models/users/user-update-me.model.ts
deleted file mode 100644
index c1d5ffba4..000000000
--- a/shared/models/users/user-update-me.model.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NSFWPolicyType } from '../videos/nsfw-policy.type'
-
-export interface UserUpdateMe {
-  displayName?: string
-  description?: string
-  nsfwPolicy?: NSFWPolicyType
-
-  p2pEnabled?: boolean
-
-  autoPlayVideo?: boolean
-  autoPlayNextVideo?: boolean
-  autoPlayNextVideoPlaylist?: boolean
-  videosHistoryEnabled?: boolean
-  videoLanguages?: string[]
-
-  email?: string
-  emailPublic?: boolean
-  currentPassword?: string
-  password?: string
-
-  theme?: string
-
-  noInstanceConfigWarningModal?: boolean
-  noWelcomeModal?: boolean
-  noAccountSetupWarningModal?: boolean
-}
diff --git a/shared/models/users/user-update.model.ts b/shared/models/users/user-update.model.ts
deleted file mode 100644
index 158738545..000000000
--- a/shared/models/users/user-update.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { UserRole } from './user-role'
-import { UserAdminFlag } from './user-flag.model'
-
-export interface UserUpdate {
-  password?: string
-  email?: string
-  emailVerified?: boolean
-  videoQuota?: number
-  videoQuotaDaily?: number
-  role?: UserRole
-  adminFlags?: UserAdminFlag
-  pluginAuth?: string
-}
diff --git a/shared/models/users/user-video-quota.model.ts b/shared/models/users/user-video-quota.model.ts
deleted file mode 100644
index a24871d71..000000000
--- a/shared/models/users/user-video-quota.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface UserVideoQuota {
-  videoQuotaUsed: number
-  videoQuotaUsedDaily: number
-}
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
deleted file mode 100644
index 9de4118b4..000000000
--- a/shared/models/users/user.model.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Account } from '../actors'
-import { VideoChannel } from '../videos/channel/video-channel.model'
-import { UserRole } from './user-role'
-import { NSFWPolicyType } from '../videos/nsfw-policy.type'
-import { UserNotificationSetting } from './user-notification-setting.model'
-import { UserAdminFlag } from './user-flag.model'
-import { VideoPlaylistType } from '../videos/playlist/video-playlist-type.model'
-
-export interface User {
-  id: number
-  username: string
-  email: string
-  pendingEmail: string | null
-
-  emailVerified: boolean
-  emailPublic: boolean
-  nsfwPolicy: NSFWPolicyType
-
-  adminFlags?: UserAdminFlag
-
-  autoPlayVideo: boolean
-  autoPlayNextVideo: boolean
-  autoPlayNextVideoPlaylist: boolean
-
-  p2pEnabled: boolean
-
-  videosHistoryEnabled: boolean
-  videoLanguages: string[]
-
-  role: {
-    id: UserRole
-    label: string
-  }
-
-  videoQuota: number
-  videoQuotaDaily: number
-  videoQuotaUsed?: number
-  videoQuotaUsedDaily?: number
-
-  videosCount?: number
-
-  abusesCount?: number
-  abusesAcceptedCount?: number
-  abusesCreatedCount?: number
-
-  videoCommentsCount?: number
-
-  theme: string
-
-  account: Account
-  notificationSettings?: UserNotificationSetting
-  videoChannels?: VideoChannel[]
-
-  blocked: boolean
-  blockedReason?: string
-
-  noInstanceConfigWarningModal: boolean
-  noWelcomeModal: boolean
-  noAccountSetupWarningModal: boolean
-
-  createdAt: Date
-
-  pluginAuth: string | null
-
-  lastLoginDate: Date | null
-
-  twoFactorEnabled: boolean
-}
-
-export interface MyUserSpecialPlaylist {
-  id: number
-  name: string
-  type: VideoPlaylistType
-}
-
-export interface MyUser extends User {
-  specialPlaylists: MyUserSpecialPlaylist[]
-}
diff --git a/shared/models/videos/blacklist/index.ts b/shared/models/videos/blacklist/index.ts
deleted file mode 100644
index 66082be34..000000000
--- a/shared/models/videos/blacklist/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './video-blacklist.model'
-export * from './video-blacklist-create.model'
-export * from './video-blacklist-update.model'
diff --git a/shared/models/videos/blacklist/video-blacklist-create.model.ts b/shared/models/videos/blacklist/video-blacklist-create.model.ts
deleted file mode 100644
index 6e7d36421..000000000
--- a/shared/models/videos/blacklist/video-blacklist-create.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface VideoBlacklistCreate {
-  reason?: string
-  unfederate?: boolean
-}
diff --git a/shared/models/videos/blacklist/video-blacklist-update.model.ts b/shared/models/videos/blacklist/video-blacklist-update.model.ts
deleted file mode 100644
index 0a86cf7b0..000000000
--- a/shared/models/videos/blacklist/video-blacklist-update.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface VideoBlacklistUpdate {
-  reason?: string
-}
diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts
deleted file mode 100644
index 982a34592..000000000
--- a/shared/models/videos/blacklist/video-blacklist.model.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Video } from '../video.model'
-
-export const enum VideoBlacklistType {
-  MANUAL = 1,
-  AUTO_BEFORE_PUBLISHED = 2
-}
-
-export interface VideoBlacklist {
-  id: number
-  unfederated: boolean
-  reason?: string
-  type: VideoBlacklistType
-
-  video: Video
-
-  createdAt: Date
-  updatedAt: Date
-}
diff --git a/shared/models/videos/caption/index.ts b/shared/models/videos/caption/index.ts
deleted file mode 100644
index 2a5ff512d..000000000
--- a/shared/models/videos/caption/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './video-caption.model'
-export * from './video-caption-update.model'
diff --git a/shared/models/videos/caption/video-caption-update.model.ts b/shared/models/videos/caption/video-caption-update.model.ts
deleted file mode 100644
index ff5728715..000000000
--- a/shared/models/videos/caption/video-caption-update.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface VideoCaptionUpdate {
-  language: string
-  captionfile: Blob
-}
diff --git a/shared/models/videos/caption/video-caption.model.ts b/shared/models/videos/caption/video-caption.model.ts
deleted file mode 100644
index 6d5665006..000000000
--- a/shared/models/videos/caption/video-caption.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { VideoConstant } from '../video-constant.model'
-
-export interface VideoCaption {
-  language: VideoConstant<string>
-  captionPath: string
-  updatedAt: string
-}
diff --git a/shared/models/videos/change-ownership/index.ts b/shared/models/videos/change-ownership/index.ts
deleted file mode 100644
index a942fb2cd..000000000
--- a/shared/models/videos/change-ownership/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './video-change-ownership-accept.model'
-export * from './video-change-ownership-create.model'
-export * from './video-change-ownership.model'
diff --git a/shared/models/videos/change-ownership/video-change-ownership-accept.model.ts b/shared/models/videos/change-ownership/video-change-ownership-accept.model.ts
deleted file mode 100644
index f27247633..000000000
--- a/shared/models/videos/change-ownership/video-change-ownership-accept.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface VideoChangeOwnershipAccept {
-  channelId: number
-}
diff --git a/shared/models/videos/change-ownership/video-change-ownership-create.model.ts b/shared/models/videos/change-ownership/video-change-ownership-create.model.ts
deleted file mode 100644
index 40fcca285..000000000
--- a/shared/models/videos/change-ownership/video-change-ownership-create.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface VideoChangeOwnershipCreate {
-  username: string
-}
diff --git a/shared/models/videos/change-ownership/video-change-ownership.model.ts b/shared/models/videos/change-ownership/video-change-ownership.model.ts
deleted file mode 100644
index 3d31cad0a..000000000
--- a/shared/models/videos/change-ownership/video-change-ownership.model.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Account } from '../../actors'
-import { Video } from '../video.model'
-
-export interface VideoChangeOwnership {
-  id: number
-  status: VideoChangeOwnershipStatus
-  initiatorAccount: Account
-  nextOwnerAccount: Account
-  video: Video
-  createdAt: Date
-}
-
-export const enum VideoChangeOwnershipStatus {
-  WAITING = 'WAITING',
-  ACCEPTED = 'ACCEPTED',
-  REFUSED = 'REFUSED'
-}
diff --git a/shared/models/videos/channel-sync/index.ts b/shared/models/videos/channel-sync/index.ts
deleted file mode 100644
index 7d25aaac3..000000000
--- a/shared/models/videos/channel-sync/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './video-channel-sync-state.enum'
-export * from './video-channel-sync.model'
-export * from './video-channel-sync-create.model'
diff --git a/shared/models/videos/channel-sync/video-channel-sync-create.model.ts b/shared/models/videos/channel-sync/video-channel-sync-create.model.ts
deleted file mode 100644
index 753a8ee4c..000000000
--- a/shared/models/videos/channel-sync/video-channel-sync-create.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface VideoChannelSyncCreate {
-  externalChannelUrl: string
-  videoChannelId: number
-}
diff --git a/shared/models/videos/channel-sync/video-channel-sync-state.enum.ts b/shared/models/videos/channel-sync/video-channel-sync-state.enum.ts
deleted file mode 100644
index 3e9f5ddc2..000000000
--- a/shared/models/videos/channel-sync/video-channel-sync-state.enum.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const enum VideoChannelSyncState {
-  WAITING_FIRST_RUN = 1,
-  PROCESSING = 2,
-  SYNCED = 3,
-  FAILED = 4
-}
diff --git a/shared/models/videos/channel-sync/video-channel-sync.model.ts b/shared/models/videos/channel-sync/video-channel-sync.model.ts
deleted file mode 100644
index 73ac0615b..000000000
--- a/shared/models/videos/channel-sync/video-channel-sync.model.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { VideoChannelSummary } from '../channel/video-channel.model'
-import { VideoConstant } from '../video-constant.model'
-import { VideoChannelSyncState } from './video-channel-sync-state.enum'
-
-export interface VideoChannelSync {
-  id: number
-
-  externalChannelUrl: string
-
-  createdAt: string
-  channel: VideoChannelSummary
-  state: VideoConstant<VideoChannelSyncState>
-  lastSyncAt: string
-}
diff --git a/shared/models/videos/channel/index.ts b/shared/models/videos/channel/index.ts
deleted file mode 100644
index 6cdabffbd..000000000
--- a/shared/models/videos/channel/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './video-channel-create-result.model'
-export * from './video-channel-create.model'
-export * from './video-channel-update.model'
-export * from './video-channel.model'
diff --git a/shared/models/videos/channel/video-channel-create-result.model.ts b/shared/models/videos/channel/video-channel-create-result.model.ts
deleted file mode 100644
index e3d7aeb4c..000000000
--- a/shared/models/videos/channel/video-channel-create-result.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface VideoChannelCreateResult {
-  id: number
-}
diff --git a/shared/models/videos/channel/video-channel-create.model.ts b/shared/models/videos/channel/video-channel-create.model.ts
deleted file mode 100644
index da8ce620c..000000000
--- a/shared/models/videos/channel/video-channel-create.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface VideoChannelCreate {
-  name: string
-  displayName: string
-  description?: string
-  support?: string
-}
diff --git a/shared/models/videos/channel/video-channel-update.model.ts b/shared/models/videos/channel/video-channel-update.model.ts
deleted file mode 100644
index 8dde9188b..000000000
--- a/shared/models/videos/channel/video-channel-update.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface VideoChannelUpdate {
-  displayName?: string
-  description?: string
-  support?: string
-
-  bulkVideosSupportUpdate?: boolean
-}
diff --git a/shared/models/videos/channel/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts
deleted file mode 100644
index ce5fc0e8d..000000000
--- a/shared/models/videos/channel/video-channel.model.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Account, ActorImage } from '../../actors'
-import { Actor } from '../../actors/actor.model'
-
-export type ViewsPerDate = {
-  date: Date
-  views: number
-}
-
-export interface VideoChannel extends Actor {
-  displayName: string
-  description: string
-  support: string
-  isLocal: boolean
-
-  updatedAt: Date | string
-
-  ownerAccount?: Account
-
-  videosCount?: number
-  viewsPerDay?: ViewsPerDate[] // chronologically ordered
-  totalViews?: number
-
-  banners: ActorImage[]
-}
-
-export interface VideoChannelSummary {
-  id: number
-  name: string
-  displayName: string
-  url: string
-  host: string
-
-  avatars: ActorImage[]
-}
diff --git a/shared/models/videos/comment/index.ts b/shared/models/videos/comment/index.ts
deleted file mode 100644
index 80c6c0724..000000000
--- a/shared/models/videos/comment/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './video-comment-create.model'
-export * from './video-comment.model'
diff --git a/shared/models/videos/comment/video-comment-create.model.ts b/shared/models/videos/comment/video-comment-create.model.ts
deleted file mode 100644
index 1f0135405..000000000
--- a/shared/models/videos/comment/video-comment-create.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface VideoCommentCreate {
-  text: string
-}
diff --git a/shared/models/videos/comment/video-comment.model.ts b/shared/models/videos/comment/video-comment.model.ts
deleted file mode 100644
index 737cfe098..000000000
--- a/shared/models/videos/comment/video-comment.model.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { ResultList } from '../../common'
-import { Account } from '../../actors'
-
-export interface VideoComment {
-  id: number
-  url: string
-  text: string
-  threadId: number
-  inReplyToCommentId: number
-  videoId: number
-  createdAt: Date | string
-  updatedAt: Date | string
-  deletedAt: Date | string
-  isDeleted: boolean
-  totalRepliesFromVideoAuthor: number
-  totalReplies: number
-  account: Account
-}
-
-export interface VideoCommentAdmin {
-  id: number
-  url: string
-  text: string
-
-  threadId: number
-  inReplyToCommentId: number
-
-  createdAt: Date | string
-  updatedAt: Date | string
-
-  account: Account
-
-  video: {
-    id: number
-    uuid: string
-    name: string
-  }
-}
-
-export type VideoCommentThreads = ResultList<VideoComment> & { totalNotDeletedComments: number }
-
-export interface VideoCommentThreadTree {
-  comment: VideoComment
-  children: VideoCommentThreadTree[]
-}
diff --git a/shared/models/videos/file/index.ts b/shared/models/videos/file/index.ts
deleted file mode 100644
index 78a784a3c..000000000
--- a/shared/models/videos/file/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './video-file-metadata.model'
-export * from './video-file.model'
-export * from './video-resolution.enum'
diff --git a/shared/models/videos/file/video-file-metadata.model.ts b/shared/models/videos/file/video-file-metadata.model.ts
deleted file mode 100644
index 8f527c0a7..000000000
--- a/shared/models/videos/file/video-file-metadata.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export class VideoFileMetadata {
-  streams: { [x: string]: any, [x: number]: any }[]
-  format: { [x: string]: any, [x: number]: any }
-  chapters: any[]
-
-  constructor (hash: { chapters: any[], format: any, streams: any[] }) {
-    this.chapters = hash.chapters
-    this.format = hash.format
-    this.streams = hash.streams
-
-    delete this.format.filename
-  }
-}
diff --git a/shared/models/videos/file/video-file.model.ts b/shared/models/videos/file/video-file.model.ts
deleted file mode 100644
index 2bbff48eb..000000000
--- a/shared/models/videos/file/video-file.model.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { VideoConstant } from '../video-constant.model'
-import { VideoFileMetadata } from './video-file-metadata.model'
-import { VideoResolution } from './video-resolution.enum'
-
-export interface VideoFile {
-  id: number
-
-  resolution: VideoConstant<VideoResolution>
-  size: number // Bytes
-
-  torrentUrl: string
-  torrentDownloadUrl: string
-
-  fileUrl: string
-  fileDownloadUrl: string
-
-  fps: number
-
-  metadata?: VideoFileMetadata
-  metadataUrl?: string
-
-  magnetUri: string | null
-}
diff --git a/shared/models/videos/file/video-resolution.enum.ts b/shared/models/videos/file/video-resolution.enum.ts
deleted file mode 100644
index 5b48ad353..000000000
--- a/shared/models/videos/file/video-resolution.enum.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const enum VideoResolution {
-  H_NOVIDEO = 0,
-  H_144P = 144,
-  H_240P = 240,
-  H_360P = 360,
-  H_480P = 480,
-  H_720P = 720,
-  H_1080P = 1080,
-  H_1440P = 1440,
-  H_4K = 2160
-}
diff --git a/shared/models/videos/import/index.ts b/shared/models/videos/import/index.ts
deleted file mode 100644
index b38a67b5f..000000000
--- a/shared/models/videos/import/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './video-import-create.model'
-export * from './video-import-state.enum'
-export * from './video-import.model'
-export * from './videos-import-in-channel-create.model'
diff --git a/shared/models/videos/import/video-import-create.model.ts b/shared/models/videos/import/video-import-create.model.ts
deleted file mode 100644
index 425477389..000000000
--- a/shared/models/videos/import/video-import-create.model.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { VideoUpdate } from '../video-update.model'
-
-export interface VideoImportCreate extends VideoUpdate {
-  targetUrl?: string
-  magnetUri?: string
-  torrentfile?: Blob
-
-  channelId: number // Required
-}
diff --git a/shared/models/videos/import/video-import-state.enum.ts b/shared/models/videos/import/video-import-state.enum.ts
deleted file mode 100644
index ff5c6beff..000000000
--- a/shared/models/videos/import/video-import-state.enum.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const enum VideoImportState {
-  PENDING = 1,
-  SUCCESS = 2,
-  FAILED = 3,
-  REJECTED = 4,
-  CANCELLED = 5,
-  PROCESSING = 6
-}
diff --git a/shared/models/videos/import/video-import.model.ts b/shared/models/videos/import/video-import.model.ts
deleted file mode 100644
index 6aed7a91a..000000000
--- a/shared/models/videos/import/video-import.model.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Video } from '../video.model'
-import { VideoConstant } from '../video-constant.model'
-import { VideoImportState } from './video-import-state.enum'
-
-export interface VideoImport {
-  id: number
-
-  targetUrl: string
-  magnetUri: string
-  torrentName: string
-
-  createdAt: string
-  updatedAt: string
-  originallyPublishedAt?: string
-  state: VideoConstant<VideoImportState>
-  error?: string
-
-  video?: Video & { tags: string[] }
-
-  videoChannelSync?: {
-    id: number
-    externalChannelUrl: string
-  }
-}
diff --git a/shared/models/videos/import/videos-import-in-channel-create.model.ts b/shared/models/videos/import/videos-import-in-channel-create.model.ts
deleted file mode 100644
index fbfef63f8..000000000
--- a/shared/models/videos/import/videos-import-in-channel-create.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface VideosImportInChannelCreate {
-  externalChannelUrl: string
-  videoChannelSyncId?: number
-}
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
deleted file mode 100644
index f8f1ce081..000000000
--- a/shared/models/videos/index.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export * from './blacklist'
-export * from './caption'
-export * from './change-ownership'
-export * from './channel'
-export * from './comment'
-export * from './studio'
-export * from './live'
-export * from './file'
-export * from './import'
-export * from './playlist'
-export * from './rate'
-export * from './stats'
-export * from './transcoding'
-export * from './channel-sync'
-
-export * from './nsfw-policy.type'
-
-export * from './storyboard.model'
-export * from './thumbnail.type'
-
-export * from './video-constant.model'
-export * from './video-create.model'
-
-export * from './video-privacy.enum'
-export * from './video-include.enum'
-export * from './video-rate.type'
-
-export * from './video-schedule-update.model'
-export * from './video-sort-field.type'
-export * from './video-state.enum'
-export * from './video-storage.enum'
-
-export * from './video-streaming-playlist.model'
-export * from './video-streaming-playlist.type'
-
-export * from './video-token.model'
-
-export * from './video-update.model'
-export * from './video-view.model'
-export * from './video.model'
-export * from './video-create-result.model'
-export * from './video-password.model'
diff --git a/shared/models/videos/live/index.ts b/shared/models/videos/live/index.ts
deleted file mode 100644
index 07b59fe2c..000000000
--- a/shared/models/videos/live/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './live-video-create.model'
-export * from './live-video-error.enum'
-export * from './live-video-event-payload.model'
-export * from './live-video-event.type'
-export * from './live-video-latency-mode.enum'
-export * from './live-video-session.model'
-export * from './live-video-update.model'
-export * from './live-video.model'
diff --git a/shared/models/videos/live/live-video-create.model.ts b/shared/models/videos/live/live-video-create.model.ts
deleted file mode 100644
index f8ae9e5a9..000000000
--- a/shared/models/videos/live/live-video-create.model.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { VideoCreate } from '../video-create.model'
-import { VideoPrivacy } from '../video-privacy.enum'
-import { LiveVideoLatencyMode } from './live-video-latency-mode.enum'
-
-export interface LiveVideoCreate extends VideoCreate {
-  permanentLive?: boolean
-  latencyMode?: LiveVideoLatencyMode
-
-  saveReplay?: boolean
-  replaySettings?: { privacy: VideoPrivacy }
-}
diff --git a/shared/models/videos/live/live-video-error.enum.ts b/shared/models/videos/live/live-video-error.enum.ts
deleted file mode 100644
index a26453505..000000000
--- a/shared/models/videos/live/live-video-error.enum.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const enum LiveVideoError {
-  BAD_SOCKET_HEALTH = 1,
-  DURATION_EXCEEDED = 2,
-  QUOTA_EXCEEDED = 3,
-  FFMPEG_ERROR = 4,
-  BLACKLISTED = 5,
-  RUNNER_JOB_ERROR = 6,
-  RUNNER_JOB_CANCEL = 7
-}
diff --git a/shared/models/videos/live/live-video-event-payload.model.ts b/shared/models/videos/live/live-video-event-payload.model.ts
deleted file mode 100644
index 646856ac3..000000000
--- a/shared/models/videos/live/live-video-event-payload.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { VideoState } from '../video-state.enum'
-
-export interface LiveVideoEventPayload {
-  state?: VideoState
-
-  viewers?: number
-}
diff --git a/shared/models/videos/live/live-video-event.type.ts b/shared/models/videos/live/live-video-event.type.ts
deleted file mode 100644
index 50f794561..000000000
--- a/shared/models/videos/live/live-video-event.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type LiveVideoEventType = 'state-change' | 'views-change'
diff --git a/shared/models/videos/live/live-video-latency-mode.enum.ts b/shared/models/videos/live/live-video-latency-mode.enum.ts
deleted file mode 100644
index 4285e1d41..000000000
--- a/shared/models/videos/live/live-video-latency-mode.enum.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const enum LiveVideoLatencyMode {
-  DEFAULT = 1,
-  HIGH_LATENCY = 2,
-  SMALL_LATENCY = 3
-}
diff --git a/shared/models/videos/live/live-video-session.model.ts b/shared/models/videos/live/live-video-session.model.ts
deleted file mode 100644
index 888c20a8a..000000000
--- a/shared/models/videos/live/live-video-session.model.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { VideoPrivacy } from '../video-privacy.enum'
-import { LiveVideoError } from './live-video-error.enum'
-
-export interface LiveVideoSession {
-  id: number
-
-  startDate: string
-  endDate: string
-
-  error: LiveVideoError
-
-  saveReplay: boolean
-  endingProcessed: boolean
-
-  replaySettings?: { privacy: VideoPrivacy }
-
-  replayVideo: {
-    id: number
-    uuid: string
-    shortUUID: string
-  }
-}
diff --git a/shared/models/videos/live/live-video-update.model.ts b/shared/models/videos/live/live-video-update.model.ts
deleted file mode 100644
index d6aa6fb37..000000000
--- a/shared/models/videos/live/live-video-update.model.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { VideoPrivacy } from '../video-privacy.enum'
-import { LiveVideoLatencyMode } from './live-video-latency-mode.enum'
-
-export interface LiveVideoUpdate {
-  permanentLive?: boolean
-  saveReplay?: boolean
-  replaySettings?: { privacy: VideoPrivacy }
-  latencyMode?: LiveVideoLatencyMode
-}
diff --git a/shared/models/videos/live/live-video.model.ts b/shared/models/videos/live/live-video.model.ts
deleted file mode 100644
index fd8454123..000000000
--- a/shared/models/videos/live/live-video.model.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { VideoPrivacy } from '../video-privacy.enum'
-import { LiveVideoLatencyMode } from './live-video-latency-mode.enum'
-
-export interface LiveVideo {
-  // If owner
-  rtmpUrl?: string
-  rtmpsUrl?: string
-  streamKey?: string
-
-  saveReplay: boolean
-  replaySettings?: { privacy: VideoPrivacy }
-  permanentLive: boolean
-  latencyMode: LiveVideoLatencyMode
-}
diff --git a/shared/models/videos/nsfw-policy.type.ts b/shared/models/videos/nsfw-policy.type.ts
deleted file mode 100644
index dc0032a14..000000000
--- a/shared/models/videos/nsfw-policy.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type NSFWPolicyType = 'do_not_list' | 'blur' | 'display'
diff --git a/shared/models/videos/playlist/index.ts b/shared/models/videos/playlist/index.ts
deleted file mode 100644
index a9e8ce496..000000000
--- a/shared/models/videos/playlist/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export * from './video-exist-in-playlist.model'
-export * from './video-playlist-create-result.model'
-export * from './video-playlist-create.model'
-export * from './video-playlist-element-create-result.model'
-export * from './video-playlist-element-create.model'
-export * from './video-playlist-element-update.model'
-export * from './video-playlist-element.model'
-export * from './video-playlist-privacy.model'
-export * from './video-playlist-reorder.model'
-export * from './video-playlist-type.model'
-export * from './video-playlist-update.model'
-export * from './video-playlist.model'
diff --git a/shared/models/videos/playlist/video-exist-in-playlist.model.ts b/shared/models/videos/playlist/video-exist-in-playlist.model.ts
deleted file mode 100644
index 6d06c0f4d..000000000
--- a/shared/models/videos/playlist/video-exist-in-playlist.model.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export type VideosExistInPlaylists = {
-  [videoId: number]: VideoExistInPlaylist[]
-}
-export type CachedVideosExistInPlaylists = {
-  [videoId: number]: CachedVideoExistInPlaylist[]
-}
-
-export type CachedVideoExistInPlaylist = {
-  playlistElementId: number
-  playlistId: number
-  startTimestamp?: number
-  stopTimestamp?: number
-}
-
-export type VideoExistInPlaylist = CachedVideoExistInPlaylist & {
-  playlistDisplayName: string
-  playlistShortUUID: string
-}
diff --git a/shared/models/videos/playlist/video-playlist-create-result.model.ts b/shared/models/videos/playlist/video-playlist-create-result.model.ts
deleted file mode 100644
index cd9b170ae..000000000
--- a/shared/models/videos/playlist/video-playlist-create-result.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface VideoPlaylistCreateResult {
-  id: number
-  uuid: string
-  shortUUID: string
-}
diff --git a/shared/models/videos/playlist/video-playlist-create.model.ts b/shared/models/videos/playlist/video-playlist-create.model.ts
deleted file mode 100644
index 67a33fa35..000000000
--- a/shared/models/videos/playlist/video-playlist-create.model.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { VideoPlaylistPrivacy } from './video-playlist-privacy.model'
-
-export interface VideoPlaylistCreate {
-  displayName: string
-  privacy: VideoPlaylistPrivacy
-
-  description?: string
-  videoChannelId?: number
-
-  thumbnailfile?: any
-}
diff --git a/shared/models/videos/playlist/video-playlist-element-create-result.model.ts b/shared/models/videos/playlist/video-playlist-element-create-result.model.ts
deleted file mode 100644
index dc475e7d8..000000000
--- a/shared/models/videos/playlist/video-playlist-element-create-result.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface VideoPlaylistElementCreateResult {
-  id: number
-}
diff --git a/shared/models/videos/playlist/video-playlist-element-create.model.ts b/shared/models/videos/playlist/video-playlist-element-create.model.ts
deleted file mode 100644
index c31702892..000000000
--- a/shared/models/videos/playlist/video-playlist-element-create.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface VideoPlaylistElementCreate {
-  videoId: number
-
-  startTimestamp?: number
-  stopTimestamp?: number
-}
diff --git a/shared/models/videos/playlist/video-playlist-element-update.model.ts b/shared/models/videos/playlist/video-playlist-element-update.model.ts
deleted file mode 100644
index 15a30fbdc..000000000
--- a/shared/models/videos/playlist/video-playlist-element-update.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface VideoPlaylistElementUpdate {
-  startTimestamp?: number
-  stopTimestamp?: number
-}
diff --git a/shared/models/videos/playlist/video-playlist-element.model.ts b/shared/models/videos/playlist/video-playlist-element.model.ts
deleted file mode 100644
index df9e3b5cf..000000000
--- a/shared/models/videos/playlist/video-playlist-element.model.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Video } from '../video.model'
-
-export const enum VideoPlaylistElementType {
-  REGULAR = 0,
-  DELETED = 1,
-  PRIVATE = 2,
-  UNAVAILABLE = 3 // Blacklisted, blocked by the user/instance, NSFW...
-}
-
-export interface VideoPlaylistElement {
-  id: number
-  position: number
-  startTimestamp: number
-  stopTimestamp: number
-
-  type: VideoPlaylistElementType
-
-  video?: Video
-}
diff --git a/shared/models/videos/playlist/video-playlist-privacy.model.ts b/shared/models/videos/playlist/video-playlist-privacy.model.ts
deleted file mode 100644
index 480e1f104..000000000
--- a/shared/models/videos/playlist/video-playlist-privacy.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const enum VideoPlaylistPrivacy {
-  PUBLIC = 1,
-  UNLISTED = 2,
-  PRIVATE = 3
-}
diff --git a/shared/models/videos/playlist/video-playlist-reorder.model.ts b/shared/models/videos/playlist/video-playlist-reorder.model.ts
deleted file mode 100644
index 63ec714c5..000000000
--- a/shared/models/videos/playlist/video-playlist-reorder.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface VideoPlaylistReorder {
-  startPosition: number
-  insertAfterPosition: number
-  reorderLength?: number
-}
diff --git a/shared/models/videos/playlist/video-playlist-type.model.ts b/shared/models/videos/playlist/video-playlist-type.model.ts
deleted file mode 100644
index 7f51a6354..000000000
--- a/shared/models/videos/playlist/video-playlist-type.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const enum VideoPlaylistType {
-  REGULAR = 1,
-  WATCH_LATER = 2
-}
diff --git a/shared/models/videos/playlist/video-playlist-update.model.ts b/shared/models/videos/playlist/video-playlist-update.model.ts
deleted file mode 100644
index a6a3f74d9..000000000
--- a/shared/models/videos/playlist/video-playlist-update.model.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { VideoPlaylistPrivacy } from './video-playlist-privacy.model'
-
-export interface VideoPlaylistUpdate {
-  displayName?: string
-  privacy?: VideoPlaylistPrivacy
-
-  description?: string
-  videoChannelId?: number
-  thumbnailfile?: any
-}
diff --git a/shared/models/videos/playlist/video-playlist.model.ts b/shared/models/videos/playlist/video-playlist.model.ts
deleted file mode 100644
index b8a9955d9..000000000
--- a/shared/models/videos/playlist/video-playlist.model.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { AccountSummary } from '../../actors/index'
-import { VideoChannelSummary, VideoConstant } from '..'
-import { VideoPlaylistPrivacy } from './video-playlist-privacy.model'
-import { VideoPlaylistType } from './video-playlist-type.model'
-
-export interface VideoPlaylist {
-  id: number
-  uuid: string
-  shortUUID: string
-
-  isLocal: boolean
-
-  url: string
-
-  displayName: string
-  description: string
-  privacy: VideoConstant<VideoPlaylistPrivacy>
-
-  thumbnailPath: string
-  thumbnailUrl?: string
-
-  videosLength: number
-
-  type: VideoConstant<VideoPlaylistType>
-
-  embedPath: string
-  embedUrl?: string
-
-  createdAt: Date | string
-  updatedAt: Date | string
-
-  ownerAccount: AccountSummary
-  videoChannel?: VideoChannelSummary
-}
diff --git a/shared/models/videos/rate/account-video-rate.model.ts b/shared/models/videos/rate/account-video-rate.model.ts
deleted file mode 100644
index e789367dc..000000000
--- a/shared/models/videos/rate/account-video-rate.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { UserVideoRateType } from './user-video-rate.type'
-import { Video } from '../video.model'
-
-export interface AccountVideoRate {
-  video: Video
-  rating: UserVideoRateType
-}
diff --git a/shared/models/videos/rate/index.ts b/shared/models/videos/rate/index.ts
deleted file mode 100644
index 06aa691bd..000000000
--- a/shared/models/videos/rate/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-
-export * from './user-video-rate-update.model'
-export * from './user-video-rate.model'
-export * from './account-video-rate.model'
-export * from './user-video-rate.type'
diff --git a/shared/models/videos/rate/user-video-rate-update.model.ts b/shared/models/videos/rate/user-video-rate-update.model.ts
deleted file mode 100644
index 85e89271a..000000000
--- a/shared/models/videos/rate/user-video-rate-update.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { UserVideoRateType } from './user-video-rate.type'
-
-export interface UserVideoRateUpdate {
-  rating: UserVideoRateType
-}
diff --git a/shared/models/videos/rate/user-video-rate.model.ts b/shared/models/videos/rate/user-video-rate.model.ts
deleted file mode 100644
index d39a1c3d5..000000000
--- a/shared/models/videos/rate/user-video-rate.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { UserVideoRateType } from './user-video-rate.type'
-
-export interface UserVideoRate {
-  videoId: number
-  rating: UserVideoRateType
-}
diff --git a/shared/models/videos/rate/user-video-rate.type.ts b/shared/models/videos/rate/user-video-rate.type.ts
deleted file mode 100644
index a4d9c7e39..000000000
--- a/shared/models/videos/rate/user-video-rate.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type UserVideoRateType = 'like' | 'dislike' | 'none'
diff --git a/shared/models/videos/stats/index.ts b/shared/models/videos/stats/index.ts
deleted file mode 100644
index a9b203f58..000000000
--- a/shared/models/videos/stats/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './video-stats-overall-query.model'
-export * from './video-stats-overall.model'
-export * from './video-stats-retention.model'
-export * from './video-stats-timeserie-query.model'
-export * from './video-stats-timeserie-metric.type'
-export * from './video-stats-timeserie.model'
diff --git a/shared/models/videos/stats/video-stats-overall-query.model.ts b/shared/models/videos/stats/video-stats-overall-query.model.ts
deleted file mode 100644
index 6b4c2164f..000000000
--- a/shared/models/videos/stats/video-stats-overall-query.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface VideoStatsOverallQuery {
-  startDate?: string
-  endDate?: string
-}
diff --git a/shared/models/videos/stats/video-stats-overall.model.ts b/shared/models/videos/stats/video-stats-overall.model.ts
deleted file mode 100644
index 54b57798f..000000000
--- a/shared/models/videos/stats/video-stats-overall.model.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export interface VideoStatsOverall {
-  averageWatchTime: number
-  totalWatchTime: number
-
-  totalViewers: number
-
-  viewersPeak: number
-  viewersPeakDate: string
-
-  countries: {
-    isoCode: string
-    viewers: number
-  }[]
-}
diff --git a/shared/models/videos/stats/video-stats-retention.model.ts b/shared/models/videos/stats/video-stats-retention.model.ts
deleted file mode 100644
index e494888ed..000000000
--- a/shared/models/videos/stats/video-stats-retention.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface VideoStatsRetention {
-  data: {
-    second: number
-    retentionPercent: number
-  }[]
-}
diff --git a/shared/models/videos/stats/video-stats-timeserie-metric.type.ts b/shared/models/videos/stats/video-stats-timeserie-metric.type.ts
deleted file mode 100644
index fc268d083..000000000
--- a/shared/models/videos/stats/video-stats-timeserie-metric.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type VideoStatsTimeserieMetric = 'viewers' | 'aggregateWatchTime'
diff --git a/shared/models/videos/stats/video-stats-timeserie-query.model.ts b/shared/models/videos/stats/video-stats-timeserie-query.model.ts
deleted file mode 100644
index f3a8430e1..000000000
--- a/shared/models/videos/stats/video-stats-timeserie-query.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface VideoStatsTimeserieQuery {
-  startDate?: string
-  endDate?: string
-}
diff --git a/shared/models/videos/stats/video-stats-timeserie.model.ts b/shared/models/videos/stats/video-stats-timeserie.model.ts
deleted file mode 100644
index 4a0e208df..000000000
--- a/shared/models/videos/stats/video-stats-timeserie.model.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface VideoStatsTimeserie {
-  groupInterval: string
-
-  data: {
-    date: string
-    value: number
-  }[]
-}
diff --git a/shared/models/videos/storyboard.model.ts b/shared/models/videos/storyboard.model.ts
deleted file mode 100644
index c92c81f09..000000000
--- a/shared/models/videos/storyboard.model.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export interface Storyboard {
-  storyboardPath: string
-
-  totalHeight: number
-  totalWidth: number
-
-  spriteHeight: number
-  spriteWidth: number
-
-  spriteDuration: number
-}
diff --git a/shared/models/videos/studio/index.ts b/shared/models/videos/studio/index.ts
deleted file mode 100644
index a1eb98a49..000000000
--- a/shared/models/videos/studio/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './video-studio-create-edit.model'
diff --git a/shared/models/videos/studio/video-studio-create-edit.model.ts b/shared/models/videos/studio/video-studio-create-edit.model.ts
deleted file mode 100644
index 5e8296dc9..000000000
--- a/shared/models/videos/studio/video-studio-create-edit.model.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-export interface VideoStudioCreateEdition {
-  tasks: VideoStudioTask[]
-}
-
-export type VideoStudioTask =
-  VideoStudioTaskCut |
-  VideoStudioTaskIntro |
-  VideoStudioTaskOutro |
-  VideoStudioTaskWatermark
-
-export interface VideoStudioTaskCut {
-  name: 'cut'
-
-  options: {
-    start?: number
-    end?: number
-  }
-}
-
-export interface VideoStudioTaskIntro {
-  name: 'add-intro'
-
-  options: {
-    file: Blob | string
-  }
-}
-
-export interface VideoStudioTaskOutro {
-  name: 'add-outro'
-
-  options: {
-    file: Blob | string
-  }
-}
-
-export interface VideoStudioTaskWatermark {
-  name: 'add-watermark'
-
-  options: {
-    file: Blob | string
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export function isVideoStudioTaskIntro (v: VideoStudioTask): v is VideoStudioTaskIntro {
-  return v.name === 'add-intro'
-}
-
-export function isVideoStudioTaskOutro (v: VideoStudioTask): v is VideoStudioTaskOutro {
-  return v.name === 'add-outro'
-}
-
-export function isVideoStudioTaskWatermark (v: VideoStudioTask): v is VideoStudioTaskWatermark {
-  return v.name === 'add-watermark'
-}
-
-export function hasVideoStudioTaskFile (v: VideoStudioTask): v is VideoStudioTaskIntro | VideoStudioTaskOutro | VideoStudioTaskWatermark {
-  return isVideoStudioTaskIntro(v) || isVideoStudioTaskOutro(v) || isVideoStudioTaskWatermark(v)
-}
diff --git a/shared/models/videos/thumbnail.type.ts b/shared/models/videos/thumbnail.type.ts
deleted file mode 100644
index 6907b2802..000000000
--- a/shared/models/videos/thumbnail.type.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const enum ThumbnailType {
-  MINIATURE = 1,
-  PREVIEW = 2
-}
diff --git a/shared/models/videos/transcoding/index.ts b/shared/models/videos/transcoding/index.ts
deleted file mode 100644
index 14472d900..000000000
--- a/shared/models/videos/transcoding/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './video-transcoding-create.model'
-export * from './video-transcoding-fps.model'
-export * from './video-transcoding.model'
diff --git a/shared/models/videos/transcoding/video-transcoding-create.model.ts b/shared/models/videos/transcoding/video-transcoding-create.model.ts
deleted file mode 100644
index 6c2dbefa6..000000000
--- a/shared/models/videos/transcoding/video-transcoding-create.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface VideoTranscodingCreate {
-  transcodingType: 'hls' | 'webtorrent' | 'web-video' // TODO: remove webtorrent in v7
-
-  forceTranscoding?: boolean // Default false
-}
diff --git a/shared/models/videos/transcoding/video-transcoding-fps.model.ts b/shared/models/videos/transcoding/video-transcoding-fps.model.ts
deleted file mode 100644
index 9a330ac94..000000000
--- a/shared/models/videos/transcoding/video-transcoding-fps.model.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type VideoTranscodingFPS = {
-  MIN: number
-  STANDARD: number[]
-  HD_STANDARD: number[]
-  AUDIO_MERGE: number
-  AVERAGE: number
-  MAX: number
-  KEEP_ORIGIN_FPS_RESOLUTION_MIN: number
-}
diff --git a/shared/models/videos/transcoding/video-transcoding.model.ts b/shared/models/videos/transcoding/video-transcoding.model.ts
deleted file mode 100644
index 91eacf8dc..000000000
--- a/shared/models/videos/transcoding/video-transcoding.model.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { VideoResolution } from '../file/video-resolution.enum'
-
-// Types used by plugins and ffmpeg-utils
-
-export type EncoderOptionsBuilderParams = {
-  input: string
-
-  resolution: VideoResolution
-
-  // If PeerTube applies a filter, transcoding profile must not copy input stream
-  canCopyAudio: boolean
-  canCopyVideo: boolean
-
-  fps: number
-
-  // Could be undefined if we could not get input bitrate (some RTMP streams for example)
-  inputBitrate: number
-  inputRatio: number
-
-  // For lives
-  streamNum?: number
-}
-
-export type EncoderOptionsBuilder = (params: EncoderOptionsBuilderParams) => Promise<EncoderOptions> | EncoderOptions
-
-export interface EncoderOptions {
-  copy?: boolean // Copy stream? Default to false
-
-  scaleFilter?: {
-    name: string
-  }
-
-  inputOptions?: string[]
-  outputOptions?: string[]
-}
-
-// All our encoders
-
-export interface EncoderProfile <T> {
-  [ profile: string ]: T
-
-  default: T
-}
-
-export type AvailableEncoders = {
-  available: {
-    live: {
-      [ encoder: string ]: EncoderProfile<EncoderOptionsBuilder>
-    }
-
-    vod: {
-      [ encoder: string ]: EncoderProfile<EncoderOptionsBuilder>
-    }
-  }
-
-  encodersToTry: {
-    vod: {
-      video: string[]
-      audio: string[]
-    }
-
-    live: {
-      video: string[]
-      audio: string[]
-    }
-  }
-}
diff --git a/shared/models/videos/video-constant.model.ts b/shared/models/videos/video-constant.model.ts
deleted file mode 100644
index 353a29535..000000000
--- a/shared/models/videos/video-constant.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface VideoConstant<T> {
-  id: T
-  label: string
-  description?: string
-}
diff --git a/shared/models/videos/video-create-result.model.ts b/shared/models/videos/video-create-result.model.ts
deleted file mode 100644
index a9f8e25a0..000000000
--- a/shared/models/videos/video-create-result.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface VideoCreateResult {
-  id: number
-  uuid: string
-  shortUUID: string
-}
diff --git a/shared/models/videos/video-create.model.ts b/shared/models/videos/video-create.model.ts
deleted file mode 100644
index 7a34b5afe..000000000
--- a/shared/models/videos/video-create.model.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { VideoPrivacy } from './video-privacy.enum'
-import { VideoScheduleUpdate } from './video-schedule-update.model'
-
-export interface VideoCreate {
-  name: string
-  channelId: number
-
-  category?: number
-  licence?: number
-  language?: string
-  description?: string
-  support?: string
-  nsfw?: boolean
-  waitTranscoding?: boolean
-  tags?: string[]
-  commentsEnabled?: boolean
-  downloadEnabled?: boolean
-  privacy: VideoPrivacy
-  scheduleUpdate?: VideoScheduleUpdate
-  originallyPublishedAt?: Date | string
-  videoPasswords?: string[]
-
-  thumbnailfile?: Blob | string
-  previewfile?: Blob | string
-}
diff --git a/shared/models/videos/video-include.enum.ts b/shared/models/videos/video-include.enum.ts
deleted file mode 100644
index 32ee12e86..000000000
--- a/shared/models/videos/video-include.enum.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const enum VideoInclude {
-  NONE = 0,
-  NOT_PUBLISHED_STATE = 1 << 0,
-  BLACKLISTED = 1 << 1,
-  BLOCKED_OWNER = 1 << 2,
-  FILES = 1 << 3,
-  CAPTIONS = 1 << 4
-}
diff --git a/shared/models/videos/video-password.model.ts b/shared/models/videos/video-password.model.ts
deleted file mode 100644
index c0280b9b9..000000000
--- a/shared/models/videos/video-password.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface VideoPassword {
-  id: number
-  password: string
-  videoId: number
-  createdAt: Date | string
-  updatedAt: Date | string
-}
diff --git a/shared/models/videos/video-privacy.enum.ts b/shared/models/videos/video-privacy.enum.ts
deleted file mode 100644
index 12e1d196f..000000000
--- a/shared/models/videos/video-privacy.enum.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const enum VideoPrivacy {
-  PUBLIC = 1,
-  UNLISTED = 2,
-  PRIVATE = 3,
-  INTERNAL = 4,
-  PASSWORD_PROTECTED = 5
-}
diff --git a/shared/models/videos/video-rate.type.ts b/shared/models/videos/video-rate.type.ts
deleted file mode 100644
index d48774a4b..000000000
--- a/shared/models/videos/video-rate.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type VideoRateType = 'like' | 'dislike'
diff --git a/shared/models/videos/video-schedule-update.model.ts b/shared/models/videos/video-schedule-update.model.ts
deleted file mode 100644
index 87d74f654..000000000
--- a/shared/models/videos/video-schedule-update.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { VideoPrivacy } from './video-privacy.enum'
-
-export interface VideoScheduleUpdate {
-  updateAt: Date | string
-  privacy?: VideoPrivacy.PUBLIC | VideoPrivacy.UNLISTED | VideoPrivacy.INTERNAL // Cannot schedule an update to PRIVATE
-}
diff --git a/shared/models/videos/video-sort-field.type.ts b/shared/models/videos/video-sort-field.type.ts
deleted file mode 100644
index 7fa07fa73..000000000
--- a/shared/models/videos/video-sort-field.type.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export type VideoSortField =
-  'name' | '-name' |
-  'duration' | '-duration' |
-  'publishedAt' | '-publishedAt' |
-  'originallyPublishedAt' | '-originallyPublishedAt' |
-  'createdAt' | '-createdAt' |
-  'views' | '-views' |
-  'likes' | '-likes' |
-
-  // trending sorts
-  'trending' | '-trending' |
-  'hot' | '-hot' |
-  'best' | '-best'
diff --git a/shared/models/videos/video-source.ts b/shared/models/videos/video-source.ts
deleted file mode 100644
index bf4ad2453..000000000
--- a/shared/models/videos/video-source.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface VideoSource {
-  filename: string
-  createdAt: string | Date
-}
diff --git a/shared/models/videos/video-state.enum.ts b/shared/models/videos/video-state.enum.ts
deleted file mode 100644
index e45e4adc2..000000000
--- a/shared/models/videos/video-state.enum.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const enum VideoState {
-  PUBLISHED = 1,
-  TO_TRANSCODE = 2,
-  TO_IMPORT = 3,
-  WAITING_FOR_LIVE = 4,
-  LIVE_ENDED = 5,
-  TO_MOVE_TO_EXTERNAL_STORAGE = 6,
-  TRANSCODING_FAILED = 7,
-  TO_MOVE_TO_EXTERNAL_STORAGE_FAILED = 8,
-  TO_EDIT = 9
-}
diff --git a/shared/models/videos/video-storage.enum.ts b/shared/models/videos/video-storage.enum.ts
deleted file mode 100644
index 7c6690db2..000000000
--- a/shared/models/videos/video-storage.enum.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const enum VideoStorage {
-  FILE_SYSTEM,
-  OBJECT_STORAGE,
-}
diff --git a/shared/models/videos/video-streaming-playlist.model.ts b/shared/models/videos/video-streaming-playlist.model.ts
deleted file mode 100644
index 11919a4ee..000000000
--- a/shared/models/videos/video-streaming-playlist.model.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { VideoStreamingPlaylistType } from './video-streaming-playlist.type'
-import { VideoFile } from './file'
-
-export interface VideoStreamingPlaylist {
-  id: number
-  type: VideoStreamingPlaylistType
-  playlistUrl: string
-  segmentsSha256Url: string
-
-  redundancies: {
-    baseUrl: string
-  }[]
-
-  files: VideoFile[]
-}
diff --git a/shared/models/videos/video-streaming-playlist.type.ts b/shared/models/videos/video-streaming-playlist.type.ts
deleted file mode 100644
index e2e2b93ea..000000000
--- a/shared/models/videos/video-streaming-playlist.type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const enum VideoStreamingPlaylistType {
-  HLS = 1
-}
diff --git a/shared/models/videos/video-token.model.ts b/shared/models/videos/video-token.model.ts
deleted file mode 100644
index aefea565f..000000000
--- a/shared/models/videos/video-token.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface VideoToken {
-  files: {
-    token: string
-    expires: string | Date
-  }
-}
diff --git a/shared/models/videos/video-update.model.ts b/shared/models/videos/video-update.model.ts
deleted file mode 100644
index 43537b5af..000000000
--- a/shared/models/videos/video-update.model.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { VideoPrivacy } from './video-privacy.enum'
-import { VideoScheduleUpdate } from './video-schedule-update.model'
-
-export interface VideoUpdate {
-  name?: string
-  category?: number
-  licence?: number
-  language?: string
-  description?: string
-  support?: string
-  privacy?: VideoPrivacy
-  tags?: string[]
-  commentsEnabled?: boolean
-  downloadEnabled?: boolean
-  nsfw?: boolean
-  waitTranscoding?: boolean
-  channelId?: number
-  thumbnailfile?: Blob
-  previewfile?: Blob
-  scheduleUpdate?: VideoScheduleUpdate
-  originallyPublishedAt?: Date | string
-  videoPasswords?: string[]
-
-  pluginData?: any
-}
diff --git a/shared/models/videos/video-view.model.ts b/shared/models/videos/video-view.model.ts
deleted file mode 100644
index f61211104..000000000
--- a/shared/models/videos/video-view.model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type VideoViewEvent = 'seek'
-
-export interface VideoView {
-  currentTime: number
-  viewEvent?: VideoViewEvent
-}
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
deleted file mode 100644
index 7e5930067..000000000
--- a/shared/models/videos/video.model.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Account, AccountSummary } from '../actors'
-import { VideoChannel, VideoChannelSummary } from './channel/video-channel.model'
-import { VideoFile } from './file'
-import { VideoConstant } from './video-constant.model'
-import { VideoPrivacy } from './video-privacy.enum'
-import { VideoScheduleUpdate } from './video-schedule-update.model'
-import { VideoState } from './video-state.enum'
-import { VideoStreamingPlaylist } from './video-streaming-playlist.model'
-
-export interface Video extends Partial<VideoAdditionalAttributes> {
-  id: number
-  uuid: string
-  shortUUID: string
-
-  createdAt: Date | string
-  updatedAt: Date | string
-  publishedAt: Date | string
-  originallyPublishedAt: Date | string
-  category: VideoConstant<number>
-  licence: VideoConstant<number>
-  language: VideoConstant<string>
-  privacy: VideoConstant<VideoPrivacy>
-
-  // Deprecated in 5.0 in favour of truncatedDescription
-  description: string
-  truncatedDescription: string
-
-  duration: number
-  isLocal: boolean
-  name: string
-
-  isLive: boolean
-
-  thumbnailPath: string
-  thumbnailUrl?: string
-
-  previewPath: string
-  previewUrl?: string
-
-  embedPath: string
-  embedUrl?: string
-
-  url: string
-
-  views: number
-  viewers: number
-
-  likes: number
-  dislikes: number
-  nsfw: boolean
-
-  account: AccountSummary
-  channel: VideoChannelSummary
-
-  userHistory?: {
-    currentTime: number
-  }
-
-  pluginData?: any
-}
-
-// Not included by default, needs query params
-export interface VideoAdditionalAttributes {
-  waitTranscoding: boolean
-  state: VideoConstant<VideoState>
-  scheduledUpdate: VideoScheduleUpdate
-
-  blacklisted: boolean
-  blacklistedReason: string
-
-  blockedOwner: boolean
-  blockedServer: boolean
-
-  files: VideoFile[]
-  streamingPlaylists: VideoStreamingPlaylist[]
-}
-
-export interface VideoDetails extends Video {
-  // Deprecated in 5.0
-  descriptionPath: string
-
-  support: string
-  channel: VideoChannel
-  account: Account
-  tags: string[]
-  commentsEnabled: boolean
-  downloadEnabled: boolean
-
-  // Not optional in details (unlike in parent Video)
-  waitTranscoding: boolean
-  state: VideoConstant<VideoState>
-
-  trackerUrls: string[]
-
-  files: VideoFile[]
-  streamingPlaylists: VideoStreamingPlaylist[]
-
-  inputFileUpdatedAt: string | Date
-}
diff --git a/shared/server-commands/bulk/bulk-command.ts b/shared/server-commands/bulk/bulk-command.ts
deleted file mode 100644
index b5c5673ce..000000000
--- a/shared/server-commands/bulk/bulk-command.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { BulkRemoveCommentsOfBody, HttpStatusCode } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class BulkCommand extends AbstractCommand {
-
-  removeCommentsOf (options: OverrideCommandOptions & {
-    attributes: BulkRemoveCommentsOfBody
-  }) {
-    const { attributes } = options
-
-    return this.postBodyRequest({
-      ...options,
-
-      path: '/api/v1/bulk/remove-comments-of',
-      fields: attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/bulk/index.ts b/shared/server-commands/bulk/index.ts
deleted file mode 100644
index 391597243..000000000
--- a/shared/server-commands/bulk/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './bulk-command'
diff --git a/shared/server-commands/cli/cli-command.ts b/shared/server-commands/cli/cli-command.ts
deleted file mode 100644
index ab9738174..000000000
--- a/shared/server-commands/cli/cli-command.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { exec } from 'child_process'
-import { AbstractCommand } from '../shared'
-
-export class CLICommand extends AbstractCommand {
-
-  static exec (command: string) {
-    return new Promise<string>((res, rej) => {
-      exec(command, (err, stdout, _stderr) => {
-        if (err) return rej(err)
-
-        return res(stdout)
-      })
-    })
-  }
-
-  getEnv () {
-    return `NODE_ENV=test NODE_APP_INSTANCE=${this.server.internalServerNumber}`
-  }
-
-  async execWithEnv (command: string, configOverride?: any) {
-    const prefix = configOverride
-      ? `NODE_CONFIG='${JSON.stringify(configOverride)}'`
-      : ''
-
-    return CLICommand.exec(`${prefix} ${this.getEnv()} ${command}`)
-  }
-}
diff --git a/shared/server-commands/cli/index.ts b/shared/server-commands/cli/index.ts
deleted file mode 100644
index 91b5abfbe..000000000
--- a/shared/server-commands/cli/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './cli-command'
diff --git a/shared/server-commands/custom-pages/custom-pages-command.ts b/shared/server-commands/custom-pages/custom-pages-command.ts
deleted file mode 100644
index cd869a8de..000000000
--- a/shared/server-commands/custom-pages/custom-pages-command.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { CustomPage, HttpStatusCode } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class CustomPagesCommand extends AbstractCommand {
-
-  getInstanceHomepage (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/custom-pages/homepage/instance'
-
-    return this.getRequestBody<CustomPage>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  updateInstanceHomepage (options: OverrideCommandOptions & {
-    content: string
-  }) {
-    const { content } = options
-    const path = '/api/v1/custom-pages/homepage/instance'
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: { content },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/custom-pages/index.ts b/shared/server-commands/custom-pages/index.ts
deleted file mode 100644
index 58aed04f2..000000000
--- a/shared/server-commands/custom-pages/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './custom-pages-command'
diff --git a/shared/server-commands/feeds/feeds-command.ts b/shared/server-commands/feeds/feeds-command.ts
deleted file mode 100644
index 26763b43e..000000000
--- a/shared/server-commands/feeds/feeds-command.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { buildUUID } from '@shared/extra-utils'
-import { HttpStatusCode } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-type FeedType = 'videos' | 'video-comments' | 'subscriptions'
-
-export class FeedCommand extends AbstractCommand {
-
-  getXML (options: OverrideCommandOptions & {
-    feed: FeedType
-    ignoreCache: boolean
-    format?: string
-  }) {
-    const { feed, format, ignoreCache } = options
-    const path = '/feeds/' + feed + '.xml'
-
-    const query: { [id: string]: string } = {}
-
-    if (ignoreCache) query.v = buildUUID()
-    if (format) query.format = format
-
-    return this.getRequestText({
-      ...options,
-
-      path,
-      query,
-      accept: 'application/xml',
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getPodcastXML (options: OverrideCommandOptions & {
-    ignoreCache: boolean
-    channelId: number
-  }) {
-    const { ignoreCache, channelId } = options
-    const path = `/feeds/podcast/videos.xml`
-
-    const query: { [id: string]: string } = {}
-
-    if (ignoreCache) query.v = buildUUID()
-    if (channelId) query.videoChannelId = channelId + ''
-
-    return this.getRequestText({
-      ...options,
-
-      path,
-      query,
-      accept: 'application/xml',
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getJSON (options: OverrideCommandOptions & {
-    feed: FeedType
-    ignoreCache: boolean
-    query?: { [ id: string ]: any }
-  }) {
-    const { feed, query = {}, ignoreCache } = options
-    const path = '/feeds/' + feed + '.json'
-
-    const cacheQuery = ignoreCache
-      ? { v: buildUUID() }
-      : {}
-
-    return this.getRequestText({
-      ...options,
-
-      path,
-      query: { ...query, ...cacheQuery },
-      accept: 'application/json',
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/feeds/index.ts b/shared/server-commands/feeds/index.ts
deleted file mode 100644
index 662a22b6f..000000000
--- a/shared/server-commands/feeds/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './feeds-command'
diff --git a/shared/server-commands/index.ts b/shared/server-commands/index.ts
deleted file mode 100644
index a4581dbc0..000000000
--- a/shared/server-commands/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export * from './bulk'
-export * from './cli'
-export * from './custom-pages'
-export * from './feeds'
-export * from './logs'
-export * from './moderation'
-export * from './overviews'
-export * from './requests'
-export * from './runners'
-export * from './search'
-export * from './server'
-export * from './socket'
-export * from './users'
-export * from './videos'
diff --git a/shared/server-commands/logs/index.ts b/shared/server-commands/logs/index.ts
deleted file mode 100644
index 69452d7f0..000000000
--- a/shared/server-commands/logs/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './logs-command'
diff --git a/shared/server-commands/logs/logs-command.ts b/shared/server-commands/logs/logs-command.ts
deleted file mode 100644
index 1c5de7f59..000000000
--- a/shared/server-commands/logs/logs-command.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { ClientLogCreate, HttpStatusCode, ServerLogLevel } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class LogsCommand extends AbstractCommand {
-
-  createLogClient (options: OverrideCommandOptions & { payload: ClientLogCreate }) {
-    const path = '/api/v1/server/logs/client'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: options.payload,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  getLogs (options: OverrideCommandOptions & {
-    startDate: Date
-    endDate?: Date
-    level?: ServerLogLevel
-    tagsOneOf?: string[]
-  }) {
-    const { startDate, endDate, tagsOneOf, level } = options
-    const path = '/api/v1/server/logs'
-
-    return this.getRequestBody<any[]>({
-      ...options,
-
-      path,
-      query: { startDate, endDate, level, tagsOneOf },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getAuditLogs (options: OverrideCommandOptions & {
-    startDate: Date
-    endDate?: Date
-  }) {
-    const { startDate, endDate } = options
-
-    const path = '/api/v1/server/audit-logs'
-
-    return this.getRequestBody({
-      ...options,
-
-      path,
-      query: { startDate, endDate },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-}
diff --git a/shared/server-commands/moderation/abuses-command.ts b/shared/server-commands/moderation/abuses-command.ts
deleted file mode 100644
index 0db32ba46..000000000
--- a/shared/server-commands/moderation/abuses-command.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-import { pick } from '@shared/core-utils'
-import {
-  AbuseFilter,
-  AbuseMessage,
-  AbusePredefinedReasonsString,
-  AbuseState,
-  AbuseUpdate,
-  AbuseVideoIs,
-  AdminAbuse,
-  HttpStatusCode,
-  ResultList,
-  UserAbuse
-} from '@shared/models'
-import { unwrapBody } from '../requests/requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class AbusesCommand extends AbstractCommand {
-
-  report (options: OverrideCommandOptions & {
-    reason: string
-
-    accountId?: number
-    videoId?: number
-    commentId?: number
-
-    predefinedReasons?: AbusePredefinedReasonsString[]
-
-    startAt?: number
-    endAt?: number
-  }) {
-    const path = '/api/v1/abuses'
-
-    const video = options.videoId
-      ? {
-        id: options.videoId,
-        startAt: options.startAt,
-        endAt: options.endAt
-      }
-      : undefined
-
-    const comment = options.commentId
-      ? { id: options.commentId }
-      : undefined
-
-    const account = options.accountId
-      ? { id: options.accountId }
-      : undefined
-
-    const body = {
-      account,
-      video,
-      comment,
-
-      reason: options.reason,
-      predefinedReasons: options.predefinedReasons
-    }
-
-    return unwrapBody<{ abuse: { id: number } }>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: body,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  getAdminList (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-
-    id?: number
-    predefinedReason?: AbusePredefinedReasonsString
-    search?: string
-    filter?: AbuseFilter
-    state?: AbuseState
-    videoIs?: AbuseVideoIs
-    searchReporter?: string
-    searchReportee?: string
-    searchVideo?: string
-    searchVideoChannel?: string
-  } = {}) {
-    const toPick: (keyof typeof options)[] = [
-      'count',
-      'filter',
-      'id',
-      'predefinedReason',
-      'search',
-      'searchReportee',
-      'searchReporter',
-      'searchVideo',
-      'searchVideoChannel',
-      'sort',
-      'start',
-      'state',
-      'videoIs'
-    ]
-
-    const path = '/api/v1/abuses'
-
-    const defaultQuery = { sort: 'createdAt' }
-    const query = { ...defaultQuery, ...pick(options, toPick) }
-
-    return this.getRequestBody<ResultList<AdminAbuse>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getUserList (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-
-    id?: number
-    search?: string
-    state?: AbuseState
-  }) {
-    const toPick: (keyof typeof options)[] = [
-      'id',
-      'search',
-      'state',
-      'start',
-      'count',
-      'sort'
-    ]
-
-    const path = '/api/v1/users/me/abuses'
-
-    const defaultQuery = { sort: 'createdAt' }
-    const query = { ...defaultQuery, ...pick(options, toPick) }
-
-    return this.getRequestBody<ResultList<UserAbuse>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  update (options: OverrideCommandOptions & {
-    abuseId: number
-    body: AbuseUpdate
-  }) {
-    const { abuseId, body } = options
-    const path = '/api/v1/abuses/' + abuseId
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: body,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  delete (options: OverrideCommandOptions & {
-    abuseId: number
-  }) {
-    const { abuseId } = options
-    const path = '/api/v1/abuses/' + abuseId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  listMessages (options: OverrideCommandOptions & {
-    abuseId: number
-  }) {
-    const { abuseId } = options
-    const path = '/api/v1/abuses/' + abuseId + '/messages'
-
-    return this.getRequestBody<ResultList<AbuseMessage>>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  deleteMessage (options: OverrideCommandOptions & {
-    abuseId: number
-    messageId: number
-  }) {
-    const { abuseId, messageId } = options
-    const path = '/api/v1/abuses/' + abuseId + '/messages/' + messageId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  addMessage (options: OverrideCommandOptions & {
-    abuseId: number
-    message: string
-  }) {
-    const { abuseId, message } = options
-    const path = '/api/v1/abuses/' + abuseId + '/messages'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { message },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-}
diff --git a/shared/server-commands/moderation/index.ts b/shared/server-commands/moderation/index.ts
deleted file mode 100644
index b37643956..000000000
--- a/shared/server-commands/moderation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './abuses-command'
diff --git a/shared/server-commands/overviews/index.ts b/shared/server-commands/overviews/index.ts
deleted file mode 100644
index e19551907..000000000
--- a/shared/server-commands/overviews/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './overviews-command'
diff --git a/shared/server-commands/overviews/overviews-command.ts b/shared/server-commands/overviews/overviews-command.ts
deleted file mode 100644
index 06b4892d2..000000000
--- a/shared/server-commands/overviews/overviews-command.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { HttpStatusCode, VideosOverview } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class OverviewsCommand extends AbstractCommand {
-
-  getVideos (options: OverrideCommandOptions & {
-    page: number
-  }) {
-    const { page } = options
-    const path = '/api/v1/overviews/videos'
-
-    const query = { page }
-
-    return this.getRequestBody<VideosOverview>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/requests/index.ts b/shared/server-commands/requests/index.ts
deleted file mode 100644
index 802982301..000000000
--- a/shared/server-commands/requests/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './requests'
diff --git a/shared/server-commands/requests/requests.ts b/shared/server-commands/requests/requests.ts
deleted file mode 100644
index 8227017eb..000000000
--- a/shared/server-commands/requests/requests.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-/* eslint-disable @typescript-eslint/no-floating-promises */
-
-import { decode } from 'querystring'
-import request from 'supertest'
-import { URL } from 'url'
-import { buildAbsoluteFixturePath, pick } from '@shared/core-utils'
-import { HttpStatusCode } from '@shared/models'
-
-export type CommonRequestParams = {
-  url: string
-  path?: string
-  contentType?: string
-  responseType?: string
-  range?: string
-  redirects?: number
-  accept?: string
-  host?: string
-  token?: string
-  headers?: { [ name: string ]: string }
-  type?: string
-  xForwardedFor?: string
-  expectedStatus?: HttpStatusCode
-}
-
-function makeRawRequest (options: {
-  url: string
-  token?: string
-  expectedStatus?: HttpStatusCode
-  range?: string
-  query?: { [ id: string ]: string }
-  method?: 'GET' | 'POST'
-  headers?: { [ name: string ]: string }
-}) {
-  const { host, protocol, pathname } = new URL(options.url)
-
-  const reqOptions = {
-    url: `${protocol}//${host}`,
-    path: pathname,
-    contentType: undefined,
-
-    ...pick(options, [ 'expectedStatus', 'range', 'token', 'query', 'headers' ])
-  }
-
-  if (options.method === 'POST') {
-    return makePostBodyRequest(reqOptions)
-  }
-
-  return makeGetRequest(reqOptions)
-}
-
-function makeGetRequest (options: CommonRequestParams & {
-  query?: any
-  rawQuery?: string
-}) {
-  const req = request(options.url).get(options.path)
-
-  if (options.query) req.query(options.query)
-  if (options.rawQuery) req.query(options.rawQuery)
-
-  return buildRequest(req, { contentType: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
-}
-
-function makeHTMLRequest (url: string, path: string) {
-  return makeGetRequest({
-    url,
-    path,
-    accept: 'text/html',
-    expectedStatus: HttpStatusCode.OK_200
-  })
-}
-
-function makeActivityPubGetRequest (url: string, path: string, expectedStatus = HttpStatusCode.OK_200) {
-  return makeGetRequest({
-    url,
-    path,
-    expectedStatus,
-    accept: 'application/activity+json,text/html;q=0.9,\\*/\\*;q=0.8'
-  })
-}
-
-function makeDeleteRequest (options: CommonRequestParams & {
-  query?: any
-  rawQuery?: string
-}) {
-  const req = request(options.url).delete(options.path)
-
-  if (options.query) req.query(options.query)
-  if (options.rawQuery) req.query(options.rawQuery)
-
-  return buildRequest(req, { accept: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
-}
-
-function makeUploadRequest (options: CommonRequestParams & {
-  method?: 'POST' | 'PUT'
-
-  fields: { [ fieldName: string ]: any }
-  attaches?: { [ attachName: string ]: any | any[] }
-}) {
-  let req = options.method === 'PUT'
-    ? request(options.url).put(options.path)
-    : request(options.url).post(options.path)
-
-  req = buildRequest(req, { accept: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
-
-  buildFields(req, options.fields)
-
-  Object.keys(options.attaches || {}).forEach(attach => {
-    const value = options.attaches[attach]
-    if (!value) return
-
-    if (Array.isArray(value)) {
-      req.attach(attach, buildAbsoluteFixturePath(value[0]), value[1])
-    } else {
-      req.attach(attach, buildAbsoluteFixturePath(value))
-    }
-  })
-
-  return req
-}
-
-function makePostBodyRequest (options: CommonRequestParams & {
-  fields?: { [ fieldName: string ]: any }
-}) {
-  const req = request(options.url).post(options.path)
-                                  .send(options.fields)
-
-  return buildRequest(req, { accept: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
-}
-
-function makePutBodyRequest (options: {
-  url: string
-  path: string
-  token?: string
-  fields: { [ fieldName: string ]: any }
-  expectedStatus?: HttpStatusCode
-  headers?: { [name: string]: string }
-}) {
-  const req = request(options.url).put(options.path)
-                                  .send(options.fields)
-
-  return buildRequest(req, { accept: 'application/json', expectedStatus: HttpStatusCode.BAD_REQUEST_400, ...options })
-}
-
-function decodeQueryString (path: string) {
-  return decode(path.split('?')[1])
-}
-
-// ---------------------------------------------------------------------------
-
-function unwrapBody <T> (test: request.Test): Promise<T> {
-  return test.then(res => res.body)
-}
-
-function unwrapText (test: request.Test): Promise<string> {
-  return test.then(res => res.text)
-}
-
-function unwrapBodyOrDecodeToJSON <T> (test: request.Test): Promise<T> {
-  return test.then(res => {
-    if (res.body instanceof Buffer) {
-      try {
-        return JSON.parse(new TextDecoder().decode(res.body))
-      } catch (err) {
-        console.error('Cannot decode JSON.', { res, body: res.body instanceof Buffer ? res.body.toString() : res.body })
-        throw err
-      }
-    }
-
-    if (res.text) {
-      try {
-        return JSON.parse(res.text)
-      } catch (err) {
-        console.error('Cannot decode json', { res, text: res.text })
-        throw err
-      }
-    }
-
-    return res.body
-  })
-}
-
-function unwrapTextOrDecode (test: request.Test): Promise<string> {
-  return test.then(res => res.text || new TextDecoder().decode(res.body))
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  makeHTMLRequest,
-  makeGetRequest,
-  decodeQueryString,
-  makeUploadRequest,
-  makePostBodyRequest,
-  makePutBodyRequest,
-  makeDeleteRequest,
-  makeRawRequest,
-  makeActivityPubGetRequest,
-  unwrapBody,
-  unwrapTextOrDecode,
-  unwrapBodyOrDecodeToJSON,
-  unwrapText
-}
-
-// ---------------------------------------------------------------------------
-
-function buildRequest (req: request.Test, options: CommonRequestParams) {
-  if (options.contentType) req.set('Accept', options.contentType)
-  if (options.responseType) req.responseType(options.responseType)
-  if (options.token) req.set('Authorization', 'Bearer ' + options.token)
-  if (options.range) req.set('Range', options.range)
-  if (options.accept) req.set('Accept', options.accept)
-  if (options.host) req.set('Host', options.host)
-  if (options.redirects) req.redirects(options.redirects)
-  if (options.xForwardedFor) req.set('X-Forwarded-For', options.xForwardedFor)
-  if (options.type) req.type(options.type)
-
-  Object.keys(options.headers || {}).forEach(name => {
-    req.set(name, options.headers[name])
-  })
-
-  return req.expect(res => {
-    if (options.expectedStatus && res.status !== options.expectedStatus) {
-      const err = new Error(`Expected status ${options.expectedStatus}, got ${res.status}. ` +
-        `\nThe server responded: "${res.body?.error ?? res.text}".\n` +
-        'You may take a closer look at the logs. To see how to do so, check out this page: ' +
-        'https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/development/tests.md#debug-server-logs');
-
-      (err as any).res = res
-
-      throw err
-    }
-
-    return res
-  })
-}
-
-function buildFields (req: request.Test, fields: { [ fieldName: string ]: any }, namespace?: string) {
-  if (!fields) return
-
-  let formKey: string
-
-  for (const key of Object.keys(fields)) {
-    if (namespace) formKey = `${namespace}[${key}]`
-    else formKey = key
-
-    if (fields[key] === undefined) continue
-
-    if (Array.isArray(fields[key]) && fields[key].length === 0) {
-      req.field(key, [])
-      continue
-    }
-
-    if (fields[key] !== null && typeof fields[key] === 'object') {
-      buildFields(req, fields[key], formKey)
-    } else {
-      req.field(formKey, fields[key])
-    }
-  }
-}
diff --git a/shared/server-commands/runners/index.ts b/shared/server-commands/runners/index.ts
deleted file mode 100644
index 9e8e1baf2..000000000
--- a/shared/server-commands/runners/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './runner-jobs-command'
-export * from './runner-registration-tokens-command'
-export * from './runners-command'
diff --git a/shared/server-commands/runners/runner-jobs-command.ts b/shared/server-commands/runners/runner-jobs-command.ts
deleted file mode 100644
index 0a0ffb5d3..000000000
--- a/shared/server-commands/runners/runner-jobs-command.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-import { omit, pick, wait } from '@shared/core-utils'
-import {
-  AbortRunnerJobBody,
-  AcceptRunnerJobBody,
-  AcceptRunnerJobResult,
-  ErrorRunnerJobBody,
-  HttpStatusCode,
-  isHLSTranscodingPayloadSuccess,
-  isLiveRTMPHLSTranscodingUpdatePayload,
-  isWebVideoOrAudioMergeTranscodingPayloadSuccess,
-  ListRunnerJobsQuery,
-  RequestRunnerJobBody,
-  RequestRunnerJobResult,
-  ResultList,
-  RunnerJobAdmin,
-  RunnerJobLiveRTMPHLSTranscodingPayload,
-  RunnerJobPayload,
-  RunnerJobState,
-  RunnerJobSuccessBody,
-  RunnerJobSuccessPayload,
-  RunnerJobType,
-  RunnerJobUpdateBody,
-  RunnerJobVODPayload
-} from '@shared/models'
-import { unwrapBody } from '../requests'
-import { waitJobs } from '../server'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class RunnerJobsCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & ListRunnerJobsQuery = {}) {
-    const path = '/api/v1/runners/jobs'
-
-    return this.getRequestBody<ResultList<RunnerJobAdmin>>({
-      ...options,
-
-      path,
-      query: pick(options, [ 'start', 'count', 'sort', 'search', 'stateOneOf' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  cancelByAdmin (options: OverrideCommandOptions & { jobUUID: string }) {
-    const path = '/api/v1/runners/jobs/' + options.jobUUID + '/cancel'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  deleteByAdmin (options: OverrideCommandOptions & { jobUUID: string }) {
-    const path = '/api/v1/runners/jobs/' + options.jobUUID
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  request (options: OverrideCommandOptions & RequestRunnerJobBody) {
-    const path = '/api/v1/runners/jobs/request'
-
-    return unwrapBody<RequestRunnerJobResult>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'runnerToken' ]),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  async requestVOD (options: OverrideCommandOptions & RequestRunnerJobBody) {
-    const vodTypes = new Set<RunnerJobType>([ 'vod-audio-merge-transcoding', 'vod-hls-transcoding', 'vod-web-video-transcoding' ])
-
-    const { availableJobs } = await this.request(options)
-
-    return {
-      availableJobs: availableJobs.filter(j => vodTypes.has(j.type))
-    } as RequestRunnerJobResult<RunnerJobVODPayload>
-  }
-
-  async requestLive (options: OverrideCommandOptions & RequestRunnerJobBody) {
-    const vodTypes = new Set<RunnerJobType>([ 'live-rtmp-hls-transcoding' ])
-
-    const { availableJobs } = await this.request(options)
-
-    return {
-      availableJobs: availableJobs.filter(j => vodTypes.has(j.type))
-    } as RequestRunnerJobResult<RunnerJobLiveRTMPHLSTranscodingPayload>
-  }
-
-  // ---------------------------------------------------------------------------
-
-  accept <T extends RunnerJobPayload = RunnerJobPayload> (options: OverrideCommandOptions & AcceptRunnerJobBody & { jobUUID: string }) {
-    const path = '/api/v1/runners/jobs/' + options.jobUUID + '/accept'
-
-    return unwrapBody<AcceptRunnerJobResult<T>>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'runnerToken' ]),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  abort (options: OverrideCommandOptions & AbortRunnerJobBody & { jobUUID: string }) {
-    const path = '/api/v1/runners/jobs/' + options.jobUUID + '/abort'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'reason', 'jobToken', 'runnerToken' ]),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  update (options: OverrideCommandOptions & RunnerJobUpdateBody & { jobUUID: string }) {
-    const path = '/api/v1/runners/jobs/' + options.jobUUID + '/update'
-
-    const { payload } = options
-    const attaches: { [id: string]: any } = {}
-    let payloadWithoutFiles = payload
-
-    if (isLiveRTMPHLSTranscodingUpdatePayload(payload)) {
-      if (payload.masterPlaylistFile) {
-        attaches[`payload[masterPlaylistFile]`] = payload.masterPlaylistFile
-      }
-
-      attaches[`payload[resolutionPlaylistFile]`] = payload.resolutionPlaylistFile
-      attaches[`payload[videoChunkFile]`] = payload.videoChunkFile
-
-      payloadWithoutFiles = omit(payloadWithoutFiles as any, [ 'masterPlaylistFile', 'resolutionPlaylistFile', 'videoChunkFile' ])
-    }
-
-    return this.postUploadRequest({
-      ...options,
-
-      path,
-      fields: {
-        ...pick(options, [ 'progress', 'jobToken', 'runnerToken' ]),
-
-        payload: payloadWithoutFiles
-      },
-      attaches,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  error (options: OverrideCommandOptions & ErrorRunnerJobBody & { jobUUID: string }) {
-    const path = '/api/v1/runners/jobs/' + options.jobUUID + '/error'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'message', 'jobToken', 'runnerToken' ]),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  success (options: OverrideCommandOptions & RunnerJobSuccessBody & { jobUUID: string }) {
-    const { payload } = options
-
-    const path = '/api/v1/runners/jobs/' + options.jobUUID + '/success'
-    const attaches: { [id: string]: any } = {}
-    let payloadWithoutFiles = payload
-
-    if ((isWebVideoOrAudioMergeTranscodingPayloadSuccess(payload) || isHLSTranscodingPayloadSuccess(payload)) && payload.videoFile) {
-      attaches[`payload[videoFile]`] = payload.videoFile
-
-      payloadWithoutFiles = omit(payloadWithoutFiles as any, [ 'videoFile' ])
-    }
-
-    if (isHLSTranscodingPayloadSuccess(payload) && payload.resolutionPlaylistFile) {
-      attaches[`payload[resolutionPlaylistFile]`] = payload.resolutionPlaylistFile
-
-      payloadWithoutFiles = omit(payloadWithoutFiles as any, [ 'resolutionPlaylistFile' ])
-    }
-
-    return this.postUploadRequest({
-      ...options,
-
-      path,
-      attaches,
-      fields: {
-        ...pick(options, [ 'jobToken', 'runnerToken' ]),
-
-        payload: payloadWithoutFiles
-      },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  getJobFile (options: OverrideCommandOptions & { url: string, jobToken: string, runnerToken: string }) {
-    const { host, protocol, pathname } = new URL(options.url)
-
-    return this.postBodyRequest({
-      url: `${protocol}//${host}`,
-      path: pathname,
-
-      fields: pick(options, [ 'jobToken', 'runnerToken' ]),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  async autoAccept (options: OverrideCommandOptions & RequestRunnerJobBody & { type?: RunnerJobType }) {
-    const { availableJobs } = await this.request(options)
-
-    const job = options.type
-      ? availableJobs.find(j => j.type === options.type)
-      : availableJobs[0]
-
-    return this.accept({ ...options, jobUUID: job.uuid })
-  }
-
-  async autoProcessWebVideoJob (runnerToken: string, jobUUIDToProcess?: string) {
-    let jobUUID = jobUUIDToProcess
-
-    if (!jobUUID) {
-      const { availableJobs } = await this.request({ runnerToken })
-      jobUUID = availableJobs[0].uuid
-    }
-
-    const { job } = await this.accept({ runnerToken, jobUUID })
-    const jobToken = job.jobToken
-
-    const payload: RunnerJobSuccessPayload = { videoFile: 'video_short.mp4' }
-    await this.success({ runnerToken, jobUUID, jobToken, payload })
-
-    await waitJobs([ this.server ])
-
-    return job
-  }
-
-  async cancelAllJobs (options: { state?: RunnerJobState } = {}) {
-    const { state } = options
-
-    const { data } = await this.list({ count: 100 })
-
-    const allowedStates = new Set<RunnerJobState>([
-      RunnerJobState.PENDING,
-      RunnerJobState.PROCESSING,
-      RunnerJobState.WAITING_FOR_PARENT_JOB
-    ])
-
-    for (const job of data) {
-      if (state && job.state.id !== state) continue
-      else if (allowedStates.has(job.state.id) !== true) continue
-
-      await this.cancelByAdmin({ jobUUID: job.uuid })
-    }
-  }
-
-  async getJob (options: OverrideCommandOptions & { uuid: string }) {
-    const { data } = await this.list({ ...options, count: 100, sort: '-updatedAt' })
-
-    return data.find(j => j.uuid === options.uuid)
-  }
-
-  async requestLiveJob (runnerToken: string) {
-    let availableJobs: RequestRunnerJobResult<RunnerJobLiveRTMPHLSTranscodingPayload>['availableJobs'] = []
-
-    while (availableJobs.length === 0) {
-      const result = await this.requestLive({ runnerToken })
-      availableJobs = result.availableJobs
-
-      if (availableJobs.length === 1) break
-
-      await wait(150)
-    }
-
-    return availableJobs[0]
-  }
-}
diff --git a/shared/server-commands/runners/runner-registration-tokens-command.ts b/shared/server-commands/runners/runner-registration-tokens-command.ts
deleted file mode 100644
index e4f2e3d95..000000000
--- a/shared/server-commands/runners/runner-registration-tokens-command.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { pick } from '@shared/core-utils'
-import { HttpStatusCode, ResultList, RunnerRegistrationToken } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class RunnerRegistrationTokensCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-  } = {}) {
-    const path = '/api/v1/runners/registration-tokens'
-
-    return this.getRequestBody<ResultList<RunnerRegistrationToken>>({
-      ...options,
-
-      path,
-      query: pick(options, [ 'start', 'count', 'sort' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  generate (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/runners/registration-tokens/generate'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  delete (options: OverrideCommandOptions & {
-    id: number
-  }) {
-    const path = '/api/v1/runners/registration-tokens/' + options.id
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  async getFirstRegistrationToken (options: OverrideCommandOptions = {}) {
-    const { data } = await this.list(options)
-
-    return data[0].registrationToken
-  }
-}
diff --git a/shared/server-commands/runners/runners-command.ts b/shared/server-commands/runners/runners-command.ts
deleted file mode 100644
index b0083e841..000000000
--- a/shared/server-commands/runners/runners-command.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { pick } from '@shared/core-utils'
-import { buildUUID } from '@shared/extra-utils'
-import { HttpStatusCode, RegisterRunnerBody, RegisterRunnerResult, ResultList, Runner, UnregisterRunnerBody } from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class RunnersCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-  } = {}) {
-    const path = '/api/v1/runners'
-
-    return this.getRequestBody<ResultList<Runner>>({
-      ...options,
-
-      path,
-      query: pick(options, [ 'start', 'count', 'sort' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  register (options: OverrideCommandOptions & RegisterRunnerBody) {
-    const path = '/api/v1/runners/register'
-
-    return unwrapBody<RegisterRunnerResult>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'name', 'registrationToken', 'description' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  unregister (options: OverrideCommandOptions & UnregisterRunnerBody) {
-    const path = '/api/v1/runners/unregister'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'runnerToken' ]),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  delete (options: OverrideCommandOptions & {
-    id: number
-  }) {
-    const path = '/api/v1/runners/' + options.id
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  async autoRegisterRunner () {
-    const { data } = await this.server.runnerRegistrationTokens.list({ sort: 'createdAt' })
-
-    const { runnerToken } = await this.register({
-      name: 'runner ' + buildUUID(),
-      registrationToken: data[0].registrationToken
-    })
-
-    return runnerToken
-  }
-}
diff --git a/shared/server-commands/search/index.ts b/shared/server-commands/search/index.ts
deleted file mode 100644
index 48dbe8ae9..000000000
--- a/shared/server-commands/search/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './search-command'
diff --git a/shared/server-commands/search/search-command.ts b/shared/server-commands/search/search-command.ts
deleted file mode 100644
index a5b498b66..000000000
--- a/shared/server-commands/search/search-command.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import {
-  HttpStatusCode,
-  ResultList,
-  Video,
-  VideoChannel,
-  VideoChannelsSearchQuery,
-  VideoPlaylist,
-  VideoPlaylistsSearchQuery,
-  VideosSearchQuery
-} from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class SearchCommand extends AbstractCommand {
-
-  searchChannels (options: OverrideCommandOptions & {
-    search: string
-  }) {
-    return this.advancedChannelSearch({
-      ...options,
-
-      search: { search: options.search }
-    })
-  }
-
-  advancedChannelSearch (options: OverrideCommandOptions & {
-    search: VideoChannelsSearchQuery
-  }) {
-    const { search } = options
-    const path = '/api/v1/search/video-channels'
-
-    return this.getRequestBody<ResultList<VideoChannel>>({
-      ...options,
-
-      path,
-      query: search,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  searchPlaylists (options: OverrideCommandOptions & {
-    search: string
-  }) {
-    return this.advancedPlaylistSearch({
-      ...options,
-
-      search: { search: options.search }
-    })
-  }
-
-  advancedPlaylistSearch (options: OverrideCommandOptions & {
-    search: VideoPlaylistsSearchQuery
-  }) {
-    const { search } = options
-    const path = '/api/v1/search/video-playlists'
-
-    return this.getRequestBody<ResultList<VideoPlaylist>>({
-      ...options,
-
-      path,
-      query: search,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  searchVideos (options: OverrideCommandOptions & {
-    search: string
-    sort?: string
-  }) {
-    const { search, sort } = options
-
-    return this.advancedVideoSearch({
-      ...options,
-
-      search: {
-        search,
-        sort: sort ?? '-publishedAt'
-      }
-    })
-  }
-
-  advancedVideoSearch (options: OverrideCommandOptions & {
-    search: VideosSearchQuery
-  }) {
-    const { search } = options
-    const path = '/api/v1/search/videos'
-
-    return this.getRequestBody<ResultList<Video>>({
-      ...options,
-
-      path,
-      query: search,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/server/config-command.ts b/shared/server-commands/server/config-command.ts
deleted file mode 100644
index 5ee2fe021..000000000
--- a/shared/server-commands/server/config-command.ts
+++ /dev/null
@@ -1,576 +0,0 @@
-import { merge } from 'lodash'
-import { About, CustomConfig, HttpStatusCode, ServerConfig } from '@shared/models'
-import { DeepPartial } from '@shared/typescript-utils'
-import { AbstractCommand, OverrideCommandOptions } from '../shared/abstract-command'
-
-export class ConfigCommand extends AbstractCommand {
-
-  static getCustomConfigResolutions (enabled: boolean, with0p = false) {
-    return {
-      '0p': enabled && with0p,
-      '144p': enabled,
-      '240p': enabled,
-      '360p': enabled,
-      '480p': enabled,
-      '720p': enabled,
-      '1080p': enabled,
-      '1440p': enabled,
-      '2160p': enabled
-    }
-  }
-
-  // ---------------------------------------------------------------------------
-
-  static getEmailOverrideConfig (emailPort: number) {
-    return {
-      smtp: {
-        hostname: '127.0.0.1',
-        port: emailPort
-      }
-    }
-  }
-
-  // ---------------------------------------------------------------------------
-
-  enableSignup (requiresApproval: boolean, limit = -1) {
-    return this.updateExistingSubConfig({
-      newConfig: {
-        signup: {
-          enabled: true,
-          requiresApproval,
-          limit
-        }
-      }
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  disableImports () {
-    return this.setImportsEnabled(false)
-  }
-
-  enableImports () {
-    return this.setImportsEnabled(true)
-  }
-
-  private setImportsEnabled (enabled: boolean) {
-    return this.updateExistingSubConfig({
-      newConfig: {
-        import: {
-          videos: {
-            http: {
-              enabled
-            },
-
-            torrent: {
-              enabled
-            }
-          }
-        }
-      }
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  disableFileUpdate () {
-    return this.setFileUpdateEnabled(false)
-  }
-
-  enableFileUpdate () {
-    return this.setFileUpdateEnabled(true)
-  }
-
-  private setFileUpdateEnabled (enabled: boolean) {
-    return this.updateExistingSubConfig({
-      newConfig: {
-        videoFile: {
-          update: {
-            enabled
-          }
-        }
-      }
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  enableChannelSync () {
-    return this.setChannelSyncEnabled(true)
-  }
-
-  disableChannelSync () {
-    return this.setChannelSyncEnabled(false)
-  }
-
-  private setChannelSyncEnabled (enabled: boolean) {
-    return this.updateExistingSubConfig({
-      newConfig: {
-        import: {
-          videoChannelSynchronization: {
-            enabled
-          }
-        }
-      }
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  enableLive (options: {
-    allowReplay?: boolean
-    transcoding?: boolean
-    resolutions?: 'min' | 'max' // Default max
-  } = {}) {
-    const { allowReplay, transcoding, resolutions = 'max' } = options
-
-    return this.updateExistingSubConfig({
-      newConfig: {
-        live: {
-          enabled: true,
-          allowReplay: allowReplay ?? true,
-          transcoding: {
-            enabled: transcoding ?? true,
-            resolutions: ConfigCommand.getCustomConfigResolutions(resolutions === 'max')
-          }
-        }
-      }
-    })
-  }
-
-  disableTranscoding () {
-    return this.updateExistingSubConfig({
-      newConfig: {
-        transcoding: {
-          enabled: false
-        },
-        videoStudio: {
-          enabled: false
-        }
-      }
-    })
-  }
-
-  enableTranscoding (options: {
-    webVideo?: boolean // default true
-    hls?: boolean // default true
-    with0p?: boolean // default false
-  } = {}) {
-    const { webVideo = true, hls = true, with0p = false } = options
-
-    return this.updateExistingSubConfig({
-      newConfig: {
-        transcoding: {
-          enabled: true,
-
-          allowAudioFiles: true,
-          allowAdditionalExtensions: true,
-
-          resolutions: ConfigCommand.getCustomConfigResolutions(true, with0p),
-
-          webVideos: {
-            enabled: webVideo
-          },
-          hls: {
-            enabled: hls
-          }
-        }
-      }
-    })
-  }
-
-  enableMinimumTranscoding (options: {
-    webVideo?: boolean // default true
-    hls?: boolean // default true
-  } = {}) {
-    const { webVideo = true, hls = true } = options
-
-    return this.updateExistingSubConfig({
-      newConfig: {
-        transcoding: {
-          enabled: true,
-
-          allowAudioFiles: true,
-          allowAdditionalExtensions: true,
-
-          resolutions: {
-            ...ConfigCommand.getCustomConfigResolutions(false),
-
-            '240p': true
-          },
-
-          webVideos: {
-            enabled: webVideo
-          },
-          hls: {
-            enabled: hls
-          }
-        }
-      }
-    })
-  }
-
-  enableRemoteTranscoding () {
-    return this.updateExistingSubConfig({
-      newConfig: {
-        transcoding: {
-          remoteRunners: {
-            enabled: true
-          }
-        },
-        live: {
-          transcoding: {
-            remoteRunners: {
-              enabled: true
-            }
-          }
-        }
-      }
-    })
-  }
-
-  enableRemoteStudio () {
-    return this.updateExistingSubConfig({
-      newConfig: {
-        videoStudio: {
-          remoteRunners: {
-            enabled: true
-          }
-        }
-      }
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  enableStudio () {
-    return this.updateExistingSubConfig({
-      newConfig: {
-        videoStudio: {
-          enabled: true
-        }
-      }
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  getConfig (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/config'
-
-    return this.getRequestBody<ServerConfig>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  async getIndexHTMLConfig (options: OverrideCommandOptions = {}) {
-    const text = await this.getRequestText({
-      ...options,
-
-      path: '/',
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-
-    const match = text.match('<script type="application/javascript">window.PeerTubeServerConfig = (".+?")</script>')
-
-    // We parse the string twice, first to extract the string and then to extract the JSON
-    return JSON.parse(JSON.parse(match[1])) as ServerConfig
-  }
-
-  getAbout (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/config/about'
-
-    return this.getRequestBody<About>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getCustomConfig (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/config/custom'
-
-    return this.getRequestBody<CustomConfig>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  updateCustomConfig (options: OverrideCommandOptions & {
-    newCustomConfig: CustomConfig
-  }) {
-    const path = '/api/v1/config/custom'
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: options.newCustomConfig,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  deleteCustomConfig (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/config/custom'
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  async updateExistingSubConfig (options: OverrideCommandOptions & {
-    newConfig: DeepPartial<CustomConfig>
-  }) {
-    const existing = await this.getCustomConfig({ ...options, expectedStatus: HttpStatusCode.OK_200 })
-
-    return this.updateCustomConfig({ ...options, newCustomConfig: merge({}, existing, options.newConfig) })
-  }
-
-  updateCustomSubConfig (options: OverrideCommandOptions & {
-    newConfig: DeepPartial<CustomConfig>
-  }) {
-    const newCustomConfig: CustomConfig = {
-      instance: {
-        name: 'PeerTube updated',
-        shortDescription: 'my short description',
-        description: 'my super description',
-        terms: 'my super terms',
-        codeOfConduct: 'my super coc',
-
-        creationReason: 'my super creation reason',
-        moderationInformation: 'my super moderation information',
-        administrator: 'Kuja',
-        maintenanceLifetime: 'forever',
-        businessModel: 'my super business model',
-        hardwareInformation: '2vCore 3GB RAM',
-
-        languages: [ 'en', 'es' ],
-        categories: [ 1, 2 ],
-
-        isNSFW: true,
-        defaultNSFWPolicy: 'blur',
-
-        defaultClientRoute: '/videos/recently-added',
-
-        customizations: {
-          javascript: 'alert("coucou")',
-          css: 'body { background-color: red; }'
-        }
-      },
-      theme: {
-        default: 'default'
-      },
-      services: {
-        twitter: {
-          username: '@MySuperUsername',
-          whitelisted: true
-        }
-      },
-      client: {
-        videos: {
-          miniature: {
-            preferAuthorDisplayName: false
-          }
-        },
-        menu: {
-          login: {
-            redirectOnSingleExternalAuth: false
-          }
-        }
-      },
-      cache: {
-        previews: {
-          size: 2
-        },
-        captions: {
-          size: 3
-        },
-        torrents: {
-          size: 4
-        },
-        storyboards: {
-          size: 5
-        }
-      },
-      signup: {
-        enabled: false,
-        limit: 5,
-        requiresApproval: true,
-        requiresEmailVerification: false,
-        minimumAge: 16
-      },
-      admin: {
-        email: 'superadmin1@example.com'
-      },
-      contactForm: {
-        enabled: true
-      },
-      user: {
-        history: {
-          videos: {
-            enabled: true
-          }
-        },
-        videoQuota: 5242881,
-        videoQuotaDaily: 318742
-      },
-      videoChannels: {
-        maxPerUser: 20
-      },
-      transcoding: {
-        enabled: true,
-        remoteRunners: {
-          enabled: false
-        },
-        allowAdditionalExtensions: true,
-        allowAudioFiles: true,
-        threads: 1,
-        concurrency: 3,
-        profile: 'default',
-        resolutions: {
-          '0p': false,
-          '144p': false,
-          '240p': false,
-          '360p': true,
-          '480p': true,
-          '720p': false,
-          '1080p': false,
-          '1440p': false,
-          '2160p': false
-        },
-        alwaysTranscodeOriginalResolution: true,
-        webVideos: {
-          enabled: true
-        },
-        hls: {
-          enabled: false
-        }
-      },
-      live: {
-        enabled: true,
-        allowReplay: false,
-        latencySetting: {
-          enabled: false
-        },
-        maxDuration: -1,
-        maxInstanceLives: -1,
-        maxUserLives: 50,
-        transcoding: {
-          enabled: true,
-          remoteRunners: {
-            enabled: false
-          },
-          threads: 4,
-          profile: 'default',
-          resolutions: {
-            '144p': true,
-            '240p': true,
-            '360p': true,
-            '480p': true,
-            '720p': true,
-            '1080p': true,
-            '1440p': true,
-            '2160p': true
-          },
-          alwaysTranscodeOriginalResolution: true
-        }
-      },
-      videoStudio: {
-        enabled: false,
-        remoteRunners: {
-          enabled: false
-        }
-      },
-      videoFile: {
-        update: {
-          enabled: false
-        }
-      },
-      import: {
-        videos: {
-          concurrency: 3,
-          http: {
-            enabled: false
-          },
-          torrent: {
-            enabled: false
-          }
-        },
-        videoChannelSynchronization: {
-          enabled: false,
-          maxPerUser: 10
-        }
-      },
-      trending: {
-        videos: {
-          algorithms: {
-            enabled: [ 'hot', 'most-viewed', 'most-liked' ],
-            default: 'hot'
-          }
-        }
-      },
-      autoBlacklist: {
-        videos: {
-          ofUsers: {
-            enabled: false
-          }
-        }
-      },
-      followers: {
-        instance: {
-          enabled: true,
-          manualApproval: false
-        }
-      },
-      followings: {
-        instance: {
-          autoFollowBack: {
-            enabled: false
-          },
-          autoFollowIndex: {
-            indexUrl: 'https://instances.joinpeertube.org/api/v1/instances/hosts',
-            enabled: false
-          }
-        }
-      },
-      broadcastMessage: {
-        enabled: true,
-        level: 'warning',
-        message: 'hello',
-        dismissable: true
-      },
-      search: {
-        remoteUri: {
-          users: true,
-          anonymous: true
-        },
-        searchIndex: {
-          enabled: true,
-          url: 'https://search.joinpeertube.org',
-          disableLocalSearch: true,
-          isDefaultSearch: true
-        }
-      }
-    }
-
-    merge(newCustomConfig, options.newConfig)
-
-    return this.updateCustomConfig({ ...options, newCustomConfig })
-  }
-}
diff --git a/shared/server-commands/server/contact-form-command.ts b/shared/server-commands/server/contact-form-command.ts
deleted file mode 100644
index 0e8fd6d84..000000000
--- a/shared/server-commands/server/contact-form-command.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { HttpStatusCode } from '@shared/models'
-import { ContactForm } from '../../models/server'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class ContactFormCommand extends AbstractCommand {
-
-  send (options: OverrideCommandOptions & {
-    fromEmail: string
-    fromName: string
-    subject: string
-    body: string
-  }) {
-    const path = '/api/v1/server/contact'
-
-    const body: ContactForm = {
-      fromEmail: options.fromEmail,
-      fromName: options.fromName,
-      subject: options.subject,
-      body: options.body
-    }
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: body,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/server/debug-command.ts b/shared/server-commands/server/debug-command.ts
deleted file mode 100644
index 3c5a785bb..000000000
--- a/shared/server-commands/server/debug-command.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Debug, HttpStatusCode, SendDebugCommand } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class DebugCommand extends AbstractCommand {
-
-  getDebug (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/server/debug'
-
-    return this.getRequestBody<Debug>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  sendCommand (options: OverrideCommandOptions & {
-    body: SendDebugCommand
-  }) {
-    const { body } = options
-    const path = '/api/v1/server/debug/run-command'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: body,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/server/follows-command.ts b/shared/server-commands/server/follows-command.ts
deleted file mode 100644
index 496e11df1..000000000
--- a/shared/server-commands/server/follows-command.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { pick } from '@shared/core-utils'
-import { ActivityPubActorType, ActorFollow, FollowState, HttpStatusCode, ResultList, ServerFollowCreate } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-import { PeerTubeServer } from './server'
-
-export class FollowsCommand extends AbstractCommand {
-
-  getFollowers (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    search?: string
-    actorType?: ActivityPubActorType
-    state?: FollowState
-  } = {}) {
-    const path = '/api/v1/server/followers'
-
-    const query = pick(options, [ 'start', 'count', 'sort', 'search', 'state', 'actorType' ])
-
-    return this.getRequestBody<ResultList<ActorFollow>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getFollowings (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    search?: string
-    actorType?: ActivityPubActorType
-    state?: FollowState
-  } = {}) {
-    const path = '/api/v1/server/following'
-
-    const query = pick(options, [ 'start', 'count', 'sort', 'search', 'state', 'actorType' ])
-
-    return this.getRequestBody<ResultList<ActorFollow>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  follow (options: OverrideCommandOptions & {
-    hosts?: string[]
-    handles?: string[]
-  }) {
-    const path = '/api/v1/server/following'
-
-    const fields: ServerFollowCreate = {}
-
-    if (options.hosts) {
-      fields.hosts = options.hosts.map(f => f.replace(/^http:\/\//, ''))
-    }
-
-    if (options.handles) {
-      fields.handles = options.handles
-    }
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  async unfollow (options: OverrideCommandOptions & {
-    target: PeerTubeServer | string
-  }) {
-    const { target } = options
-
-    const handle = typeof target === 'string'
-      ? target
-      : target.host
-
-    const path = '/api/v1/server/following/' + handle
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  acceptFollower (options: OverrideCommandOptions & {
-    follower: string
-  }) {
-    const path = '/api/v1/server/followers/' + options.follower + '/accept'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  rejectFollower (options: OverrideCommandOptions & {
-    follower: string
-  }) {
-    const path = '/api/v1/server/followers/' + options.follower + '/reject'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  removeFollower (options: OverrideCommandOptions & {
-    follower: PeerTubeServer
-  }) {
-    const path = '/api/v1/server/followers/peertube@' + options.follower.host
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/server/follows.ts b/shared/server-commands/server/follows.ts
deleted file mode 100644
index 698238f29..000000000
--- a/shared/server-commands/server/follows.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { waitJobs } from './jobs'
-import { PeerTubeServer } from './server'
-
-async function doubleFollow (server1: PeerTubeServer, server2: PeerTubeServer) {
-  await Promise.all([
-    server1.follows.follow({ hosts: [ server2.url ] }),
-    server2.follows.follow({ hosts: [ server1.url ] })
-  ])
-
-  // Wait request propagation
-  await waitJobs([ server1, server2 ])
-
-  return true
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  doubleFollow
-}
diff --git a/shared/server-commands/server/index.ts b/shared/server-commands/server/index.ts
deleted file mode 100644
index 9a2fbf8d3..000000000
--- a/shared/server-commands/server/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export * from './config-command'
-export * from './contact-form-command'
-export * from './debug-command'
-export * from './follows-command'
-export * from './follows'
-export * from './jobs'
-export * from './jobs-command'
-export * from './metrics-command'
-export * from './object-storage-command'
-export * from './plugins-command'
-export * from './redundancy-command'
-export * from './server'
-export * from './servers-command'
-export * from './servers'
-export * from './stats-command'
diff --git a/shared/server-commands/server/jobs-command.ts b/shared/server-commands/server/jobs-command.ts
deleted file mode 100644
index b8790ea00..000000000
--- a/shared/server-commands/server/jobs-command.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { pick } from '@shared/core-utils'
-import { HttpStatusCode, Job, JobState, JobType, ResultList } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class JobsCommand extends AbstractCommand {
-
-  async getLatest (options: OverrideCommandOptions & {
-    jobType: JobType
-  }) {
-    const { data } = await this.list({ ...options, start: 0, count: 1, sort: '-createdAt' })
-
-    if (data.length === 0) return undefined
-
-    return data[0]
-  }
-
-  pauseJobQueue (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/jobs/pause'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  resumeJobQueue (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/jobs/resume'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  list (options: OverrideCommandOptions & {
-    state?: JobState
-    jobType?: JobType
-    start?: number
-    count?: number
-    sort?: string
-  } = {}) {
-    const path = this.buildJobsUrl(options.state)
-
-    const query = pick(options, [ 'start', 'count', 'sort', 'jobType' ])
-
-    return this.getRequestBody<ResultList<Job>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listFailed (options: OverrideCommandOptions & {
-    jobType?: JobType
-  }) {
-    const path = this.buildJobsUrl('failed')
-
-    return this.getRequestBody<ResultList<Job>>({
-      ...options,
-
-      path,
-      query: { start: 0, count: 50 },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  private buildJobsUrl (state?: JobState) {
-    let path = '/api/v1/jobs'
-
-    if (state) path += '/' + state
-
-    return path
-  }
-}
diff --git a/shared/server-commands/server/jobs.ts b/shared/server-commands/server/jobs.ts
deleted file mode 100644
index 8f131fba4..000000000
--- a/shared/server-commands/server/jobs.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-
-import { expect } from 'chai'
-import { wait } from '@shared/core-utils'
-import { JobState, JobType, RunnerJobState } from '../../models'
-import { PeerTubeServer } from './server'
-
-async function waitJobs (
-  serversArg: PeerTubeServer[] | PeerTubeServer,
-  options: {
-    skipDelayed?: boolean // default false
-    runnerJobs?: boolean // default false
-  } = {}
-) {
-  const { skipDelayed = false, runnerJobs = false } = options
-
-  const pendingJobWait = process.env.NODE_PENDING_JOB_WAIT
-    ? parseInt(process.env.NODE_PENDING_JOB_WAIT, 10)
-    : 250
-
-  let servers: PeerTubeServer[]
-
-  if (Array.isArray(serversArg) === false) servers = [ serversArg as PeerTubeServer ]
-  else servers = serversArg as PeerTubeServer[]
-
-  const states: JobState[] = [ 'waiting', 'active' ]
-  if (!skipDelayed) states.push('delayed')
-
-  const repeatableJobs: JobType[] = [ 'videos-views-stats', 'activitypub-cleaner' ]
-  let pendingRequests: boolean
-
-  function tasksBuilder () {
-    const tasks: Promise<any>[] = []
-
-    // Check if each server has pending request
-    for (const server of servers) {
-      if (process.env.DEBUG) console.log('Checking ' + server.url)
-
-      for (const state of states) {
-
-        const jobPromise = server.jobs.list({
-          state,
-          start: 0,
-          count: 10,
-          sort: '-createdAt'
-        }).then(body => body.data)
-          .then(jobs => jobs.filter(j => !repeatableJobs.includes(j.type)))
-          .then(jobs => {
-            if (jobs.length !== 0) {
-              pendingRequests = true
-
-              if (process.env.DEBUG) {
-                console.log(jobs)
-              }
-            }
-          })
-
-        tasks.push(jobPromise)
-      }
-
-      const debugPromise = server.debug.getDebug()
-        .then(obj => {
-          if (obj.activityPubMessagesWaiting !== 0) {
-            pendingRequests = true
-
-            if (process.env.DEBUG) {
-              console.log('AP messages waiting: ' + obj.activityPubMessagesWaiting)
-            }
-          }
-        })
-      tasks.push(debugPromise)
-
-      if (runnerJobs) {
-        const runnerJobsPromise = server.runnerJobs.list({ count: 100 })
-          .then(({ data }) => {
-            for (const job of data) {
-              if (job.state.id !== RunnerJobState.COMPLETED) {
-                pendingRequests = true
-
-                if (process.env.DEBUG) {
-                  console.log(job)
-                }
-              }
-            }
-          })
-        tasks.push(runnerJobsPromise)
-      }
-    }
-
-    return tasks
-  }
-
-  do {
-    pendingRequests = false
-    await Promise.all(tasksBuilder())
-
-    // Retry, in case of new jobs were created
-    if (pendingRequests === false) {
-      await wait(pendingJobWait)
-      await Promise.all(tasksBuilder())
-    }
-
-    if (pendingRequests) {
-      await wait(pendingJobWait)
-    }
-  } while (pendingRequests)
-}
-
-async function expectNoFailedTranscodingJob (server: PeerTubeServer) {
-  const { data } = await server.jobs.listFailed({ jobType: 'video-transcoding' })
-  expect(data).to.have.lengthOf(0)
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  waitJobs,
-  expectNoFailedTranscodingJob
-}
diff --git a/shared/server-commands/server/metrics-command.ts b/shared/server-commands/server/metrics-command.ts
deleted file mode 100644
index d22b4833d..000000000
--- a/shared/server-commands/server/metrics-command.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpStatusCode, PlaybackMetricCreate } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class MetricsCommand extends AbstractCommand {
-
-  addPlaybackMetric (options: OverrideCommandOptions & { metrics: PlaybackMetricCreate }) {
-    const path = '/api/v1/metrics/playback'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: options.metrics,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/server/object-storage-command.ts b/shared/server-commands/server/object-storage-command.ts
deleted file mode 100644
index 6bb232c36..000000000
--- a/shared/server-commands/server/object-storage-command.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import { randomInt } from 'crypto'
-import { HttpStatusCode } from '@shared/models'
-import { makePostBodyRequest } from '../requests'
-
-export class ObjectStorageCommand {
-  static readonly DEFAULT_SCALEWAY_BUCKET = 'peertube-ci-test'
-
-  private readonly bucketsCreated: string[] = []
-  private readonly seed: number
-
-  // ---------------------------------------------------------------------------
-
-  constructor () {
-    this.seed = randomInt(0, 10000)
-  }
-
-  static getMockCredentialsConfig () {
-    return {
-      access_key_id: 'AKIAIOSFODNN7EXAMPLE',
-      secret_access_key: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
-    }
-  }
-
-  static getMockEndpointHost () {
-    return 'localhost:9444'
-  }
-
-  static getMockRegion () {
-    return 'us-east-1'
-  }
-
-  getDefaultMockConfig () {
-    return {
-      object_storage: {
-        enabled: true,
-        endpoint: 'http://' + ObjectStorageCommand.getMockEndpointHost(),
-        region: ObjectStorageCommand.getMockRegion(),
-
-        credentials: ObjectStorageCommand.getMockCredentialsConfig(),
-
-        streaming_playlists: {
-          bucket_name: this.getMockStreamingPlaylistsBucketName()
-        },
-
-        web_videos: {
-          bucket_name: this.getMockWebVideosBucketName()
-        }
-      }
-    }
-  }
-
-  getMockWebVideosBaseUrl () {
-    return `http://${this.getMockWebVideosBucketName()}.${ObjectStorageCommand.getMockEndpointHost()}/`
-  }
-
-  getMockPlaylistBaseUrl () {
-    return `http://${this.getMockStreamingPlaylistsBucketName()}.${ObjectStorageCommand.getMockEndpointHost()}/`
-  }
-
-  async prepareDefaultMockBuckets () {
-    await this.createMockBucket(this.getMockStreamingPlaylistsBucketName())
-    await this.createMockBucket(this.getMockWebVideosBucketName())
-  }
-
-  async createMockBucket (name: string) {
-    this.bucketsCreated.push(name)
-
-    await this.deleteMockBucket(name)
-
-    await makePostBodyRequest({
-      url: ObjectStorageCommand.getMockEndpointHost(),
-      path: '/ui/' + name + '?create',
-      expectedStatus: HttpStatusCode.TEMPORARY_REDIRECT_307
-    })
-
-    await makePostBodyRequest({
-      url: ObjectStorageCommand.getMockEndpointHost(),
-      path: '/ui/' + name + '?make-public',
-      expectedStatus: HttpStatusCode.TEMPORARY_REDIRECT_307
-    })
-  }
-
-  async cleanupMock () {
-    for (const name of this.bucketsCreated) {
-      await this.deleteMockBucket(name)
-    }
-  }
-
-  getMockStreamingPlaylistsBucketName (name = 'streaming-playlists') {
-    return this.getMockBucketName(name)
-  }
-
-  getMockWebVideosBucketName (name = 'web-videos') {
-    return this.getMockBucketName(name)
-  }
-
-  getMockBucketName (name: string) {
-    return `${this.seed}-${name}`
-  }
-
-  private async deleteMockBucket (name: string) {
-    await makePostBodyRequest({
-      url: ObjectStorageCommand.getMockEndpointHost(),
-      path: '/ui/' + name + '?delete',
-      expectedStatus: HttpStatusCode.TEMPORARY_REDIRECT_307
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  static getDefaultScalewayConfig (options: {
-    serverNumber: number
-    enablePrivateProxy?: boolean // default true
-    privateACL?: 'private' | 'public-read' // default 'private'
-  }) {
-    const { serverNumber, enablePrivateProxy = true, privateACL = 'private' } = options
-
-    return {
-      object_storage: {
-        enabled: true,
-        endpoint: this.getScalewayEndpointHost(),
-        region: this.getScalewayRegion(),
-
-        credentials: this.getScalewayCredentialsConfig(),
-
-        upload_acl: {
-          private: privateACL
-        },
-
-        proxy: {
-          proxify_private_files: enablePrivateProxy
-        },
-
-        streaming_playlists: {
-          bucket_name: this.DEFAULT_SCALEWAY_BUCKET,
-          prefix: `test:server-${serverNumber}-streaming-playlists:`
-        },
-
-        web_videos: {
-          bucket_name: this.DEFAULT_SCALEWAY_BUCKET,
-          prefix: `test:server-${serverNumber}-web-videos:`
-        }
-      }
-    }
-  }
-
-  static getScalewayCredentialsConfig () {
-    return {
-      access_key_id: process.env.OBJECT_STORAGE_SCALEWAY_KEY_ID,
-      secret_access_key: process.env.OBJECT_STORAGE_SCALEWAY_ACCESS_KEY
-    }
-  }
-
-  static getScalewayEndpointHost () {
-    return 's3.fr-par.scw.cloud'
-  }
-
-  static getScalewayRegion () {
-    return 'fr-par'
-  }
-
-  static getScalewayBaseUrl () {
-    return `https://${this.DEFAULT_SCALEWAY_BUCKET}.${this.getScalewayEndpointHost()}/`
-  }
-}
diff --git a/shared/server-commands/server/plugins-command.ts b/shared/server-commands/server/plugins-command.ts
deleted file mode 100644
index bb1277a7c..000000000
--- a/shared/server-commands/server/plugins-command.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { readJSON, writeJSON } from 'fs-extra'
-import { join } from 'path'
-import { root } from '@shared/core-utils'
-import {
-  HttpStatusCode,
-  PeerTubePlugin,
-  PeerTubePluginIndex,
-  PeertubePluginIndexList,
-  PluginPackageJSON,
-  PluginTranslation,
-  PluginType,
-  PublicServerSetting,
-  RegisteredServerSettings,
-  ResultList
-} from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class PluginsCommand extends AbstractCommand {
-
-  static getPluginTestPath (suffix = '') {
-    return join(root(), 'server', 'tests', 'fixtures', 'peertube-plugin-test' + suffix)
-  }
-
-  list (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    pluginType?: PluginType
-    uninstalled?: boolean
-  }) {
-    const { start, count, sort, pluginType, uninstalled } = options
-    const path = '/api/v1/plugins'
-
-    return this.getRequestBody<ResultList<PeerTubePlugin>>({
-      ...options,
-
-      path,
-      query: {
-        start,
-        count,
-        sort,
-        pluginType,
-        uninstalled
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listAvailable (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    pluginType?: PluginType
-    currentPeerTubeEngine?: string
-    search?: string
-    expectedStatus?: HttpStatusCode
-  }) {
-    const { start, count, sort, pluginType, search, currentPeerTubeEngine } = options
-    const path = '/api/v1/plugins/available'
-
-    const query: PeertubePluginIndexList = {
-      start,
-      count,
-      sort,
-      pluginType,
-      currentPeerTubeEngine,
-      search
-    }
-
-    return this.getRequestBody<ResultList<PeerTubePluginIndex>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  get (options: OverrideCommandOptions & {
-    npmName: string
-  }) {
-    const path = '/api/v1/plugins/' + options.npmName
-
-    return this.getRequestBody<PeerTubePlugin>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  updateSettings (options: OverrideCommandOptions & {
-    npmName: string
-    settings: any
-  }) {
-    const { npmName, settings } = options
-    const path = '/api/v1/plugins/' + npmName + '/settings'
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: { settings },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  getRegisteredSettings (options: OverrideCommandOptions & {
-    npmName: string
-  }) {
-    const path = '/api/v1/plugins/' + options.npmName + '/registered-settings'
-
-    return this.getRequestBody<RegisteredServerSettings>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getPublicSettings (options: OverrideCommandOptions & {
-    npmName: string
-  }) {
-    const { npmName } = options
-    const path = '/api/v1/plugins/' + npmName + '/public-settings'
-
-    return this.getRequestBody<PublicServerSetting>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getTranslations (options: OverrideCommandOptions & {
-    locale: string
-  }) {
-    const { locale } = options
-    const path = '/plugins/translations/' + locale + '.json'
-
-    return this.getRequestBody<PluginTranslation>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  install (options: OverrideCommandOptions & {
-    path?: string
-    npmName?: string
-    pluginVersion?: string
-  }) {
-    const { npmName, path, pluginVersion } = options
-    const apiPath = '/api/v1/plugins/install'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path: apiPath,
-      fields: { npmName, path, pluginVersion },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  update (options: OverrideCommandOptions & {
-    path?: string
-    npmName?: string
-  }) {
-    const { npmName, path } = options
-    const apiPath = '/api/v1/plugins/update'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path: apiPath,
-      fields: { npmName, path },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  uninstall (options: OverrideCommandOptions & {
-    npmName: string
-  }) {
-    const { npmName } = options
-    const apiPath = '/api/v1/plugins/uninstall'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path: apiPath,
-      fields: { npmName },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  getCSS (options: OverrideCommandOptions = {}) {
-    const path = '/plugins/global.css'
-
-    return this.getRequestText({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getExternalAuth (options: OverrideCommandOptions & {
-    npmName: string
-    npmVersion: string
-    authName: string
-    query?: any
-  }) {
-    const { npmName, npmVersion, authName, query } = options
-
-    const path = '/plugins/' + npmName + '/' + npmVersion + '/auth/' + authName
-
-    return this.getRequest({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200,
-      redirects: 0
-    })
-  }
-
-  updatePackageJSON (npmName: string, json: any) {
-    const path = this.getPackageJSONPath(npmName)
-
-    return writeJSON(path, json)
-  }
-
-  getPackageJSON (npmName: string): Promise<PluginPackageJSON> {
-    const path = this.getPackageJSONPath(npmName)
-
-    return readJSON(path)
-  }
-
-  private getPackageJSONPath (npmName: string) {
-    return this.server.servers.buildDirectory(join('plugins', 'node_modules', npmName, 'package.json'))
-  }
-}
diff --git a/shared/server-commands/server/redundancy-command.ts b/shared/server-commands/server/redundancy-command.ts
deleted file mode 100644
index e7a8b3c29..000000000
--- a/shared/server-commands/server/redundancy-command.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { HttpStatusCode, ResultList, VideoRedundanciesTarget, VideoRedundancy } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class RedundancyCommand extends AbstractCommand {
-
-  updateRedundancy (options: OverrideCommandOptions & {
-    host: string
-    redundancyAllowed: boolean
-  }) {
-    const { host, redundancyAllowed } = options
-    const path = '/api/v1/server/redundancy/' + host
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: { redundancyAllowed },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  listVideos (options: OverrideCommandOptions & {
-    target: VideoRedundanciesTarget
-    start?: number
-    count?: number
-    sort?: string
-  }) {
-    const path = '/api/v1/server/redundancy/videos'
-
-    const { target, start, count, sort } = options
-
-    return this.getRequestBody<ResultList<VideoRedundancy>>({
-      ...options,
-
-      path,
-
-      query: {
-        start: start ?? 0,
-        count: count ?? 5,
-        sort: sort ?? 'name',
-        target
-      },
-
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  addVideo (options: OverrideCommandOptions & {
-    videoId: number
-  }) {
-    const path = '/api/v1/server/redundancy/videos'
-    const { videoId } = options
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { videoId },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  removeVideo (options: OverrideCommandOptions & {
-    redundancyId: number
-  }) {
-    const { redundancyId } = options
-    const path = '/api/v1/server/redundancy/videos/' + redundancyId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/server/server.ts b/shared/server-commands/server/server.ts
deleted file mode 100644
index 38568a890..000000000
--- a/shared/server-commands/server/server.ts
+++ /dev/null
@@ -1,450 +0,0 @@
-import { ChildProcess, fork } from 'child_process'
-import { copy } from 'fs-extra'
-import { join } from 'path'
-import { parallelTests, randomInt, root } from '@shared/core-utils'
-import { Video, VideoChannel, VideoChannelSync, VideoCreateResult, VideoDetails } from '@shared/models'
-import { BulkCommand } from '../bulk'
-import { CLICommand } from '../cli'
-import { CustomPagesCommand } from '../custom-pages'
-import { FeedCommand } from '../feeds'
-import { LogsCommand } from '../logs'
-import { AbusesCommand } from '../moderation'
-import { OverviewsCommand } from '../overviews'
-import { RunnerJobsCommand, RunnerRegistrationTokensCommand, RunnersCommand } from '../runners'
-import { SearchCommand } from '../search'
-import { SocketIOCommand } from '../socket'
-import {
-  AccountsCommand,
-  BlocklistCommand,
-  LoginCommand,
-  NotificationsCommand,
-  RegistrationsCommand,
-  SubscriptionsCommand,
-  TwoFactorCommand,
-  UsersCommand
-} from '../users'
-import {
-  BlacklistCommand,
-  CaptionsCommand,
-  ChangeOwnershipCommand,
-  ChannelsCommand,
-  ChannelSyncsCommand,
-  HistoryCommand,
-  ImportsCommand,
-  LiveCommand,
-  VideoPasswordsCommand,
-  PlaylistsCommand,
-  ServicesCommand,
-  StoryboardCommand,
-  StreamingPlaylistsCommand,
-  VideosCommand,
-  VideoStudioCommand,
-  VideoTokenCommand,
-  ViewsCommand
-} from '../videos'
-import { CommentsCommand } from '../videos/comments-command'
-import { VideoStatsCommand } from '../videos/video-stats-command'
-import { ConfigCommand } from './config-command'
-import { ContactFormCommand } from './contact-form-command'
-import { DebugCommand } from './debug-command'
-import { FollowsCommand } from './follows-command'
-import { JobsCommand } from './jobs-command'
-import { MetricsCommand } from './metrics-command'
-import { PluginsCommand } from './plugins-command'
-import { RedundancyCommand } from './redundancy-command'
-import { ServersCommand } from './servers-command'
-import { StatsCommand } from './stats-command'
-
-export type RunServerOptions = {
-  hideLogs?: boolean
-  nodeArgs?: string[]
-  peertubeArgs?: string[]
-  env?: { [ id: string ]: string }
-}
-
-export class PeerTubeServer {
-  app?: ChildProcess
-
-  url: string
-  host?: string
-  hostname?: string
-  port?: number
-
-  rtmpPort?: number
-  rtmpsPort?: number
-
-  parallel?: boolean
-  internalServerNumber: number
-
-  serverNumber?: number
-  customConfigFile?: string
-
-  store?: {
-    client?: {
-      id?: string
-      secret?: string
-    }
-
-    user?: {
-      username: string
-      password: string
-      email?: string
-    }
-
-    channel?: VideoChannel
-    videoChannelSync?: Partial<VideoChannelSync>
-
-    video?: Video
-    videoCreated?: VideoCreateResult
-    videoDetails?: VideoDetails
-
-    videos?: { id: number, uuid: string }[]
-  }
-
-  accessToken?: string
-  refreshToken?: string
-
-  bulk?: BulkCommand
-  cli?: CLICommand
-  customPage?: CustomPagesCommand
-  feed?: FeedCommand
-  logs?: LogsCommand
-  abuses?: AbusesCommand
-  overviews?: OverviewsCommand
-  search?: SearchCommand
-  contactForm?: ContactFormCommand
-  debug?: DebugCommand
-  follows?: FollowsCommand
-  jobs?: JobsCommand
-  metrics?: MetricsCommand
-  plugins?: PluginsCommand
-  redundancy?: RedundancyCommand
-  stats?: StatsCommand
-  config?: ConfigCommand
-  socketIO?: SocketIOCommand
-  accounts?: AccountsCommand
-  blocklist?: BlocklistCommand
-  subscriptions?: SubscriptionsCommand
-  live?: LiveCommand
-  services?: ServicesCommand
-  blacklist?: BlacklistCommand
-  captions?: CaptionsCommand
-  changeOwnership?: ChangeOwnershipCommand
-  playlists?: PlaylistsCommand
-  history?: HistoryCommand
-  imports?: ImportsCommand
-  channelSyncs?: ChannelSyncsCommand
-  streamingPlaylists?: StreamingPlaylistsCommand
-  channels?: ChannelsCommand
-  comments?: CommentsCommand
-  notifications?: NotificationsCommand
-  servers?: ServersCommand
-  login?: LoginCommand
-  users?: UsersCommand
-  videoStudio?: VideoStudioCommand
-  videos?: VideosCommand
-  videoStats?: VideoStatsCommand
-  views?: ViewsCommand
-  twoFactor?: TwoFactorCommand
-  videoToken?: VideoTokenCommand
-  registrations?: RegistrationsCommand
-  videoPasswords?: VideoPasswordsCommand
-
-  storyboard?: StoryboardCommand
-
-  runners?: RunnersCommand
-  runnerRegistrationTokens?: RunnerRegistrationTokensCommand
-  runnerJobs?: RunnerJobsCommand
-
-  constructor (options: { serverNumber: number } | { url: string }) {
-    if ((options as any).url) {
-      this.setUrl((options as any).url)
-    } else {
-      this.setServerNumber((options as any).serverNumber)
-    }
-
-    this.store = {
-      client: {
-        id: null,
-        secret: null
-      },
-      user: {
-        username: null,
-        password: null
-      }
-    }
-
-    this.assignCommands()
-  }
-
-  setServerNumber (serverNumber: number) {
-    this.serverNumber = serverNumber
-
-    this.parallel = parallelTests()
-
-    this.internalServerNumber = this.parallel ? this.randomServer() : this.serverNumber
-    this.rtmpPort = this.parallel ? this.randomRTMP() : 1936
-    this.rtmpsPort = this.parallel ? this.randomRTMP() : 1937
-    this.port = 9000 + this.internalServerNumber
-
-    this.url = `http://127.0.0.1:${this.port}`
-    this.host = `127.0.0.1:${this.port}`
-    this.hostname = '127.0.0.1'
-  }
-
-  setUrl (url: string) {
-    const parsed = new URL(url)
-
-    this.url = url
-    this.host = parsed.host
-    this.hostname = parsed.hostname
-    this.port = parseInt(parsed.port)
-  }
-
-  getDirectoryPath (directoryName: string) {
-    const testDirectory = 'test' + this.internalServerNumber
-
-    return join(root(), testDirectory, directoryName)
-  }
-
-  async flushAndRun (configOverride?: object, options: RunServerOptions = {}) {
-    await ServersCommand.flushTests(this.internalServerNumber)
-
-    return this.run(configOverride, options)
-  }
-
-  async run (configOverrideArg?: any, options: RunServerOptions = {}) {
-    // These actions are async so we need to be sure that they have both been done
-    const serverRunString = {
-      'HTTP server listening': false
-    }
-    const key = 'Database peertube_test' + this.internalServerNumber + ' is ready'
-    serverRunString[key] = false
-
-    const regexps = {
-      client_id: 'Client id: (.+)',
-      client_secret: 'Client secret: (.+)',
-      user_username: 'Username: (.+)',
-      user_password: 'User password: (.+)'
-    }
-
-    await this.assignCustomConfigFile()
-
-    const configOverride = this.buildConfigOverride()
-
-    if (configOverrideArg !== undefined) {
-      Object.assign(configOverride, configOverrideArg)
-    }
-
-    // Share the environment
-    const env = { ...process.env }
-    env['NODE_ENV'] = 'test'
-    env['NODE_APP_INSTANCE'] = this.internalServerNumber.toString()
-    env['NODE_CONFIG'] = JSON.stringify(configOverride)
-
-    if (options.env) {
-      Object.assign(env, options.env)
-    }
-
-    const execArgv = options.nodeArgs || []
-    // FIXME: too slow :/
-    // execArgv.push('--enable-source-maps')
-
-    const forkOptions = {
-      silent: true,
-      env,
-      detached: false,
-      execArgv
-    }
-
-    const peertubeArgs = options.peertubeArgs || []
-
-    return new Promise<void>((res, rej) => {
-      const self = this
-      let aggregatedLogs = ''
-
-      this.app = fork(join(root(), 'dist', 'server.js'), peertubeArgs, forkOptions)
-
-      const onPeerTubeExit = () => rej(new Error('Process exited:\n' + aggregatedLogs))
-      const onParentExit = () => {
-        if (!this.app?.pid) return
-
-        try {
-          process.kill(self.app.pid)
-        } catch { /* empty */ }
-      }
-
-      this.app.on('exit', onPeerTubeExit)
-      process.on('exit', onParentExit)
-
-      this.app.stdout.on('data', function onStdout (data) {
-        let dontContinue = false
-
-        const log: string = data.toString()
-        aggregatedLogs += log
-
-        // Capture things if we want to
-        for (const key of Object.keys(regexps)) {
-          const regexp = regexps[key]
-          const matches = log.match(regexp)
-          if (matches !== null) {
-            if (key === 'client_id') self.store.client.id = matches[1]
-            else if (key === 'client_secret') self.store.client.secret = matches[1]
-            else if (key === 'user_username') self.store.user.username = matches[1]
-            else if (key === 'user_password') self.store.user.password = matches[1]
-          }
-        }
-
-        // Check if all required sentences are here
-        for (const key of Object.keys(serverRunString)) {
-          if (log.includes(key)) serverRunString[key] = true
-          if (serverRunString[key] === false) dontContinue = true
-        }
-
-        // If no, there is maybe one thing not already initialized (client/user credentials generation...)
-        if (dontContinue === true) return
-
-        if (options.hideLogs === false) {
-          console.log(log)
-        } else {
-          process.removeListener('exit', onParentExit)
-          self.app.stdout.removeListener('data', onStdout)
-          self.app.removeListener('exit', onPeerTubeExit)
-        }
-
-        res()
-      })
-    })
-  }
-
-  kill () {
-    if (!this.app) return Promise.resolve()
-
-    process.kill(this.app.pid)
-
-    this.app = null
-
-    return Promise.resolve()
-  }
-
-  private randomServer () {
-    const low = 2500
-    const high = 10000
-
-    return randomInt(low, high)
-  }
-
-  private randomRTMP () {
-    const low = 1900
-    const high = 2100
-
-    return randomInt(low, high)
-  }
-
-  private async assignCustomConfigFile () {
-    if (this.internalServerNumber === this.serverNumber) return
-
-    const basePath = join(root(), 'config')
-
-    const tmpConfigFile = join(basePath, `test-${this.internalServerNumber}.yaml`)
-    await copy(join(basePath, `test-${this.serverNumber}.yaml`), tmpConfigFile)
-
-    this.customConfigFile = tmpConfigFile
-  }
-
-  private buildConfigOverride () {
-    if (!this.parallel) return {}
-
-    return {
-      listen: {
-        port: this.port
-      },
-      webserver: {
-        port: this.port
-      },
-      database: {
-        suffix: '_test' + this.internalServerNumber
-      },
-      storage: {
-        tmp: this.getDirectoryPath('tmp') + '/',
-        tmp_persistent: this.getDirectoryPath('tmp-persistent') + '/',
-        bin: this.getDirectoryPath('bin') + '/',
-        avatars: this.getDirectoryPath('avatars') + '/',
-        web_videos: this.getDirectoryPath('web-videos') + '/',
-        streaming_playlists: this.getDirectoryPath('streaming-playlists') + '/',
-        redundancy: this.getDirectoryPath('redundancy') + '/',
-        logs: this.getDirectoryPath('logs') + '/',
-        previews: this.getDirectoryPath('previews') + '/',
-        thumbnails: this.getDirectoryPath('thumbnails') + '/',
-        storyboards: this.getDirectoryPath('storyboards') + '/',
-        torrents: this.getDirectoryPath('torrents') + '/',
-        captions: this.getDirectoryPath('captions') + '/',
-        cache: this.getDirectoryPath('cache') + '/',
-        plugins: this.getDirectoryPath('plugins') + '/',
-        well_known: this.getDirectoryPath('well-known') + '/'
-      },
-      admin: {
-        email: `admin${this.internalServerNumber}@example.com`
-      },
-      live: {
-        rtmp: {
-          port: this.rtmpPort
-        }
-      }
-    }
-  }
-
-  private assignCommands () {
-    this.bulk = new BulkCommand(this)
-    this.cli = new CLICommand(this)
-    this.customPage = new CustomPagesCommand(this)
-    this.feed = new FeedCommand(this)
-    this.logs = new LogsCommand(this)
-    this.abuses = new AbusesCommand(this)
-    this.overviews = new OverviewsCommand(this)
-    this.search = new SearchCommand(this)
-    this.contactForm = new ContactFormCommand(this)
-    this.debug = new DebugCommand(this)
-    this.follows = new FollowsCommand(this)
-    this.jobs = new JobsCommand(this)
-    this.metrics = new MetricsCommand(this)
-    this.plugins = new PluginsCommand(this)
-    this.redundancy = new RedundancyCommand(this)
-    this.stats = new StatsCommand(this)
-    this.config = new ConfigCommand(this)
-    this.socketIO = new SocketIOCommand(this)
-    this.accounts = new AccountsCommand(this)
-    this.blocklist = new BlocklistCommand(this)
-    this.subscriptions = new SubscriptionsCommand(this)
-    this.live = new LiveCommand(this)
-    this.services = new ServicesCommand(this)
-    this.blacklist = new BlacklistCommand(this)
-    this.captions = new CaptionsCommand(this)
-    this.changeOwnership = new ChangeOwnershipCommand(this)
-    this.playlists = new PlaylistsCommand(this)
-    this.history = new HistoryCommand(this)
-    this.imports = new ImportsCommand(this)
-    this.channelSyncs = new ChannelSyncsCommand(this)
-    this.streamingPlaylists = new StreamingPlaylistsCommand(this)
-    this.channels = new ChannelsCommand(this)
-    this.comments = new CommentsCommand(this)
-    this.notifications = new NotificationsCommand(this)
-    this.servers = new ServersCommand(this)
-    this.login = new LoginCommand(this)
-    this.users = new UsersCommand(this)
-    this.videos = new VideosCommand(this)
-    this.videoStudio = new VideoStudioCommand(this)
-    this.videoStats = new VideoStatsCommand(this)
-    this.views = new ViewsCommand(this)
-    this.twoFactor = new TwoFactorCommand(this)
-    this.videoToken = new VideoTokenCommand(this)
-    this.registrations = new RegistrationsCommand(this)
-
-    this.storyboard = new StoryboardCommand(this)
-
-    this.runners = new RunnersCommand(this)
-    this.runnerRegistrationTokens = new RunnerRegistrationTokensCommand(this)
-    this.runnerJobs = new RunnerJobsCommand(this)
-    this.videoPasswords = new VideoPasswordsCommand(this)
-  }
-}
diff --git a/shared/server-commands/server/servers-command.ts b/shared/server-commands/server/servers-command.ts
deleted file mode 100644
index 54e586a18..000000000
--- a/shared/server-commands/server/servers-command.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { exec } from 'child_process'
-import { copy, ensureDir, readFile, readdir, remove } from 'fs-extra'
-import { basename, join } from 'path'
-import { isGithubCI, root, wait } from '@shared/core-utils'
-import { getFileSize } from '@shared/extra-utils'
-import { HttpStatusCode } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class ServersCommand extends AbstractCommand {
-
-  static flushTests (internalServerNumber: number) {
-    return new Promise<void>((res, rej) => {
-      const suffix = ` -- ${internalServerNumber}`
-
-      return exec('npm run clean:server:test' + suffix, (err, _stdout, stderr) => {
-        if (err || stderr) return rej(err || new Error(stderr))
-
-        return res()
-      })
-    })
-  }
-
-  ping (options: OverrideCommandOptions = {}) {
-    return this.getRequestBody({
-      ...options,
-
-      path: '/api/v1/ping',
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  cleanupTests () {
-    const promises: Promise<any>[] = []
-
-    const saveGithubLogsIfNeeded = async () => {
-      if (!isGithubCI()) return
-
-      await ensureDir('artifacts')
-
-      const origin = this.buildDirectory('logs/peertube.log')
-      const destname = `peertube-${this.server.internalServerNumber}.log`
-      console.log('Saving logs %s.', destname)
-
-      await copy(origin, join('artifacts', destname))
-    }
-
-    if (this.server.parallel) {
-      const promise = saveGithubLogsIfNeeded()
-                        .then(() => ServersCommand.flushTests(this.server.internalServerNumber))
-
-      promises.push(promise)
-    }
-
-    if (this.server.customConfigFile) {
-      promises.push(remove(this.server.customConfigFile))
-    }
-
-    return promises
-  }
-
-  async waitUntilLog (str: string, count = 1, strictCount = true) {
-    const logfile = this.buildDirectory('logs/peertube.log')
-
-    while (true) {
-      const buf = await readFile(logfile)
-
-      const matches = buf.toString().match(new RegExp(str, 'g'))
-      if (matches && matches.length === count) return
-      if (matches && strictCount === false && matches.length >= count) return
-
-      await wait(1000)
-    }
-  }
-
-  buildDirectory (directory: string) {
-    return join(root(), 'test' + this.server.internalServerNumber, directory)
-  }
-
-  async countFiles (directory: string) {
-    const files = await readdir(this.buildDirectory(directory))
-
-    return files.length
-  }
-
-  buildWebVideoFilePath (fileUrl: string) {
-    return this.buildDirectory(join('web-videos', basename(fileUrl)))
-  }
-
-  buildFragmentedFilePath (videoUUID: string, fileUrl: string) {
-    return this.buildDirectory(join('streaming-playlists', 'hls', videoUUID, basename(fileUrl)))
-  }
-
-  getLogContent () {
-    return readFile(this.buildDirectory('logs/peertube.log'))
-  }
-
-  async getServerFileSize (subPath: string) {
-    const path = this.server.servers.buildDirectory(subPath)
-
-    return getFileSize(path)
-  }
-}
diff --git a/shared/server-commands/server/servers.ts b/shared/server-commands/server/servers.ts
deleted file mode 100644
index fe9da9e63..000000000
--- a/shared/server-commands/server/servers.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { ensureDir } from 'fs-extra'
-import { isGithubCI } from '@shared/core-utils'
-import { PeerTubeServer, RunServerOptions } from './server'
-
-async function createSingleServer (serverNumber: number, configOverride?: object, options: RunServerOptions = {}) {
-  const server = new PeerTubeServer({ serverNumber })
-
-  await server.flushAndRun(configOverride, options)
-
-  return server
-}
-
-function createMultipleServers (totalServers: number, configOverride?: object, options: RunServerOptions = {}) {
-  const serverPromises: Promise<PeerTubeServer>[] = []
-
-  for (let i = 1; i <= totalServers; i++) {
-    serverPromises.push(createSingleServer(i, configOverride, options))
-  }
-
-  return Promise.all(serverPromises)
-}
-
-function killallServers (servers: PeerTubeServer[]) {
-  return Promise.all(servers.map(s => s.kill()))
-}
-
-async function cleanupTests (servers: PeerTubeServer[]) {
-  await killallServers(servers)
-
-  if (isGithubCI()) {
-    await ensureDir('artifacts')
-  }
-
-  let p: Promise<any>[] = []
-  for (const server of servers) {
-    p = p.concat(server.servers.cleanupTests())
-  }
-
-  return Promise.all(p)
-}
-
-function getServerImportConfig (mode: 'youtube-dl' | 'yt-dlp') {
-  return {
-    import: {
-      videos: {
-        http: {
-          youtube_dl_release: {
-            url: mode === 'youtube-dl'
-              ? 'https://yt-dl.org/downloads/latest/youtube-dl'
-              : 'https://api.github.com/repos/yt-dlp/yt-dlp/releases',
-
-            name: mode
-          }
-        }
-      }
-    }
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  createSingleServer,
-  createMultipleServers,
-  cleanupTests,
-  killallServers,
-  getServerImportConfig
-}
diff --git a/shared/server-commands/server/stats-command.ts b/shared/server-commands/server/stats-command.ts
deleted file mode 100644
index 64a452306..000000000
--- a/shared/server-commands/server/stats-command.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { HttpStatusCode, ServerStats } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class StatsCommand extends AbstractCommand {
-
-  get (options: OverrideCommandOptions & {
-    useCache?: boolean // default false
-  } = {}) {
-    const { useCache = false } = options
-    const path = '/api/v1/server/stats'
-
-    const query = {
-      t: useCache ? undefined : new Date().getTime()
-    }
-
-    return this.getRequestBody<ServerStats>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/shared/abstract-command.ts b/shared/server-commands/shared/abstract-command.ts
deleted file mode 100644
index 463acc26b..000000000
--- a/shared/server-commands/shared/abstract-command.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-import { isAbsolute, join } from 'path'
-import { root } from '@shared/core-utils'
-import {
-  makeDeleteRequest,
-  makeGetRequest,
-  makePostBodyRequest,
-  makePutBodyRequest,
-  makeUploadRequest,
-  unwrapBody,
-  unwrapText
-} from '../requests/requests'
-import { PeerTubeServer } from '../server/server'
-
-export interface OverrideCommandOptions {
-  token?: string
-  expectedStatus?: number
-}
-
-interface InternalCommonCommandOptions extends OverrideCommandOptions {
-  // Default to server.url
-  url?: string
-
-  path: string
-  // If we automatically send the server token if the token is not provided
-  implicitToken: boolean
-  defaultExpectedStatus: number
-
-  // Common optional request parameters
-  contentType?: string
-  accept?: string
-  redirects?: number
-  range?: string
-  host?: string
-  headers?: { [ name: string ]: string }
-  requestType?: string
-  responseType?: string
-  xForwardedFor?: string
-}
-
-interface InternalGetCommandOptions extends InternalCommonCommandOptions {
-  query?: { [ id: string ]: any }
-}
-
-interface InternalDeleteCommandOptions extends InternalCommonCommandOptions {
-  query?: { [ id: string ]: any }
-  rawQuery?: string
-}
-
-abstract class AbstractCommand {
-
-  constructor (
-    protected server: PeerTubeServer
-  ) {
-
-  }
-
-  protected getRequestBody <T> (options: InternalGetCommandOptions) {
-    return unwrapBody<T>(this.getRequest(options))
-  }
-
-  protected getRequestText (options: InternalGetCommandOptions) {
-    return unwrapText(this.getRequest(options))
-  }
-
-  protected getRawRequest (options: Omit<InternalGetCommandOptions, 'path'>) {
-    const { url, range } = options
-    const { host, protocol, pathname } = new URL(url)
-
-    return this.getRequest({
-      ...options,
-
-      token: this.buildCommonRequestToken(options),
-      defaultExpectedStatus: this.buildExpectedStatus(options),
-
-      url: `${protocol}//${host}`,
-      path: pathname,
-      range
-    })
-  }
-
-  protected getRequest (options: InternalGetCommandOptions) {
-    const { query } = options
-
-    return makeGetRequest({
-      ...this.buildCommonRequestOptions(options),
-
-      query
-    })
-  }
-
-  protected deleteRequest (options: InternalDeleteCommandOptions) {
-    const { query, rawQuery } = options
-
-    return makeDeleteRequest({
-      ...this.buildCommonRequestOptions(options),
-
-      query,
-      rawQuery
-    })
-  }
-
-  protected putBodyRequest (options: InternalCommonCommandOptions & {
-    fields?: { [ fieldName: string ]: any }
-    headers?: { [name: string]: string }
-  }) {
-    const { fields, headers } = options
-
-    return makePutBodyRequest({
-      ...this.buildCommonRequestOptions(options),
-
-      fields,
-      headers
-    })
-  }
-
-  protected postBodyRequest (options: InternalCommonCommandOptions & {
-    fields?: { [ fieldName: string ]: any }
-    headers?: { [name: string]: string }
-  }) {
-    const { fields, headers } = options
-
-    return makePostBodyRequest({
-      ...this.buildCommonRequestOptions(options),
-
-      fields,
-      headers
-    })
-  }
-
-  protected postUploadRequest (options: InternalCommonCommandOptions & {
-    fields?: { [ fieldName: string ]: any }
-    attaches?: { [ fieldName: string ]: any }
-  }) {
-    const { fields, attaches } = options
-
-    return makeUploadRequest({
-      ...this.buildCommonRequestOptions(options),
-
-      method: 'POST',
-      fields,
-      attaches
-    })
-  }
-
-  protected putUploadRequest (options: InternalCommonCommandOptions & {
-    fields?: { [ fieldName: string ]: any }
-    attaches?: { [ fieldName: string ]: any }
-  }) {
-    const { fields, attaches } = options
-
-    return makeUploadRequest({
-      ...this.buildCommonRequestOptions(options),
-
-      method: 'PUT',
-      fields,
-      attaches
-    })
-  }
-
-  protected updateImageRequest (options: InternalCommonCommandOptions & {
-    fixture: string
-    fieldname: string
-  }) {
-    const filePath = isAbsolute(options.fixture)
-      ? options.fixture
-      : join(root(), 'server', 'tests', 'fixtures', options.fixture)
-
-    return this.postUploadRequest({
-      ...options,
-
-      fields: {},
-      attaches: { [options.fieldname]: filePath }
-    })
-  }
-
-  protected buildCommonRequestOptions (options: InternalCommonCommandOptions) {
-    const { url, path, redirects, contentType, accept, range, host, headers, requestType, xForwardedFor, responseType } = options
-
-    return {
-      url: url ?? this.server.url,
-      path,
-
-      token: this.buildCommonRequestToken(options),
-      expectedStatus: this.buildExpectedStatus(options),
-
-      redirects,
-      contentType,
-      range,
-      host,
-      accept,
-      headers,
-      type: requestType,
-      responseType,
-      xForwardedFor
-    }
-  }
-
-  protected buildCommonRequestToken (options: Pick<InternalCommonCommandOptions, 'token' | 'implicitToken'>) {
-    const { token } = options
-
-    const fallbackToken = options.implicitToken
-      ? this.server.accessToken
-      : undefined
-
-    return token !== undefined ? token : fallbackToken
-  }
-
-  protected buildExpectedStatus (options: Pick<InternalCommonCommandOptions, 'expectedStatus' | 'defaultExpectedStatus'>) {
-    const { expectedStatus, defaultExpectedStatus } = options
-
-    return expectedStatus !== undefined ? expectedStatus : defaultExpectedStatus
-  }
-
-  protected buildVideoPasswordHeader (videoPassword: string) {
-    return videoPassword !== undefined && videoPassword !== null
-      ? { 'x-peertube-video-password': videoPassword }
-      : undefined
-  }
-}
-
-export {
-  AbstractCommand
-}
diff --git a/shared/server-commands/shared/index.ts b/shared/server-commands/shared/index.ts
deleted file mode 100644
index e807ab4f7..000000000
--- a/shared/server-commands/shared/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './abstract-command'
diff --git a/shared/server-commands/socket/index.ts b/shared/server-commands/socket/index.ts
deleted file mode 100644
index 594329b2f..000000000
--- a/shared/server-commands/socket/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './socket-io-command'
diff --git a/shared/server-commands/socket/socket-io-command.ts b/shared/server-commands/socket/socket-io-command.ts
deleted file mode 100644
index c28a86366..000000000
--- a/shared/server-commands/socket/socket-io-command.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { io } from 'socket.io-client'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class SocketIOCommand extends AbstractCommand {
-
-  getUserNotificationSocket (options: OverrideCommandOptions = {}) {
-    return io(this.server.url + '/user-notifications', {
-      query: { accessToken: options.token ?? this.server.accessToken }
-    })
-  }
-
-  getLiveNotificationSocket () {
-    return io(this.server.url + '/live-videos')
-  }
-
-  getRunnersSocket (options: {
-    runnerToken: string
-  }) {
-    return io(this.server.url + '/runners', {
-      reconnection: false,
-      auth: { runnerToken: options.runnerToken }
-    })
-  }
-}
diff --git a/shared/server-commands/users/accounts-command.ts b/shared/server-commands/users/accounts-command.ts
deleted file mode 100644
index 5844b330b..000000000
--- a/shared/server-commands/users/accounts-command.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Account, AccountVideoRate, ActorFollow, HttpStatusCode, ResultList, VideoRateType } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class AccountsCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & {
-    sort?: string // default -createdAt
-  } = {}) {
-    const { sort = '-createdAt' } = options
-    const path = '/api/v1/accounts'
-
-    return this.getRequestBody<ResultList<Account>>({
-      ...options,
-
-      path,
-      query: { sort },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  get (options: OverrideCommandOptions & {
-    accountName: string
-  }) {
-    const path = '/api/v1/accounts/' + options.accountName
-
-    return this.getRequestBody<Account>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listRatings (options: OverrideCommandOptions & {
-    accountName: string
-    rating?: VideoRateType
-  }) {
-    const { rating, accountName } = options
-    const path = '/api/v1/accounts/' + accountName + '/ratings'
-
-    const query = { rating }
-
-    return this.getRequestBody<ResultList<AccountVideoRate>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listFollowers (options: OverrideCommandOptions & {
-    accountName: string
-    start?: number
-    count?: number
-    sort?: string
-    search?: string
-  }) {
-    const { accountName, start, count, sort, search } = options
-    const path = '/api/v1/accounts/' + accountName + '/followers'
-
-    const query = { start, count, sort, search }
-
-    return this.getRequestBody<ResultList<ActorFollow>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/users/accounts.ts b/shared/server-commands/users/accounts.ts
deleted file mode 100644
index 6387891f4..000000000
--- a/shared/server-commands/users/accounts.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { PeerTubeServer } from '../server/server'
-
-async function setDefaultAccountAvatar (serversArg: PeerTubeServer | PeerTubeServer[], token?: string) {
-  const servers = Array.isArray(serversArg)
-    ? serversArg
-    : [ serversArg ]
-
-  for (const server of servers) {
-    await server.users.updateMyAvatar({ fixture: 'avatar.png', token })
-  }
-}
-
-export {
-  setDefaultAccountAvatar
-}
diff --git a/shared/server-commands/users/blocklist-command.ts b/shared/server-commands/users/blocklist-command.ts
deleted file mode 100644
index 862d8945e..000000000
--- a/shared/server-commands/users/blocklist-command.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { AccountBlock, BlockStatus, HttpStatusCode, ResultList, ServerBlock } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-type ListBlocklistOptions = OverrideCommandOptions & {
-  start: number
-  count: number
-
-  sort?: string // default -createdAt
-
-  search?: string
-}
-
-export class BlocklistCommand extends AbstractCommand {
-
-  listMyAccountBlocklist (options: ListBlocklistOptions) {
-    const path = '/api/v1/users/me/blocklist/accounts'
-
-    return this.listBlocklist<AccountBlock>(options, path)
-  }
-
-  listMyServerBlocklist (options: ListBlocklistOptions) {
-    const path = '/api/v1/users/me/blocklist/servers'
-
-    return this.listBlocklist<ServerBlock>(options, path)
-  }
-
-  listServerAccountBlocklist (options: ListBlocklistOptions) {
-    const path = '/api/v1/server/blocklist/accounts'
-
-    return this.listBlocklist<AccountBlock>(options, path)
-  }
-
-  listServerServerBlocklist (options: ListBlocklistOptions) {
-    const path = '/api/v1/server/blocklist/servers'
-
-    return this.listBlocklist<ServerBlock>(options, path)
-  }
-
-  // ---------------------------------------------------------------------------
-
-  getStatus (options: OverrideCommandOptions & {
-    accounts?: string[]
-    hosts?: string[]
-  }) {
-    const { accounts, hosts } = options
-
-    const path = '/api/v1/blocklist/status'
-
-    return this.getRequestBody<BlockStatus>({
-      ...options,
-
-      path,
-      query: {
-        accounts,
-        hosts
-      },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  addToMyBlocklist (options: OverrideCommandOptions & {
-    account?: string
-    server?: string
-  }) {
-    const { account, server } = options
-
-    const path = account
-      ? '/api/v1/users/me/blocklist/accounts'
-      : '/api/v1/users/me/blocklist/servers'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: {
-        accountName: account,
-        host: server
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  addToServerBlocklist (options: OverrideCommandOptions & {
-    account?: string
-    server?: string
-  }) {
-    const { account, server } = options
-
-    const path = account
-      ? '/api/v1/server/blocklist/accounts'
-      : '/api/v1/server/blocklist/servers'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: {
-        accountName: account,
-        host: server
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  removeFromMyBlocklist (options: OverrideCommandOptions & {
-    account?: string
-    server?: string
-  }) {
-    const { account, server } = options
-
-    const path = account
-      ? '/api/v1/users/me/blocklist/accounts/' + account
-      : '/api/v1/users/me/blocklist/servers/' + server
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  removeFromServerBlocklist (options: OverrideCommandOptions & {
-    account?: string
-    server?: string
-  }) {
-    const { account, server } = options
-
-    const path = account
-      ? '/api/v1/server/blocklist/accounts/' + account
-      : '/api/v1/server/blocklist/servers/' + server
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  private listBlocklist <T> (options: ListBlocklistOptions, path: string) {
-    const { start, count, search, sort = '-createdAt' } = options
-
-    return this.getRequestBody<ResultList<T>>({
-      ...options,
-
-      path,
-      query: { start, count, sort, search },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-}
diff --git a/shared/server-commands/users/index.ts b/shared/server-commands/users/index.ts
deleted file mode 100644
index 404756539..000000000
--- a/shared/server-commands/users/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export * from './accounts-command'
-export * from './accounts'
-export * from './blocklist-command'
-export * from './login'
-export * from './login-command'
-export * from './notifications-command'
-export * from './registrations-command'
-export * from './subscriptions-command'
-export * from './two-factor-command'
-export * from './users-command'
diff --git a/shared/server-commands/users/login-command.ts b/shared/server-commands/users/login-command.ts
deleted file mode 100644
index f2fc6d1c5..000000000
--- a/shared/server-commands/users/login-command.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { HttpStatusCode, PeerTubeProblemDocument } from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-type LoginOptions = OverrideCommandOptions & {
-  client?: { id?: string, secret?: string }
-  user?: { username: string, password?: string }
-  otpToken?: string
-}
-
-export class LoginCommand extends AbstractCommand {
-
-  async login (options: LoginOptions = {}) {
-    const res = await this._login(options)
-
-    return this.unwrapLoginBody(res.body)
-  }
-
-  async loginAndGetResponse (options: LoginOptions = {}) {
-    const res = await this._login(options)
-
-    return {
-      res,
-      body: this.unwrapLoginBody(res.body)
-    }
-  }
-
-  getAccessToken (arg1?: { username: string, password?: string }): Promise<string>
-  getAccessToken (arg1: string, password?: string): Promise<string>
-  async getAccessToken (arg1?: { username: string, password?: string } | string, password?: string) {
-    let user: { username: string, password?: string }
-
-    if (!arg1) user = this.server.store.user
-    else if (typeof arg1 === 'object') user = arg1
-    else user = { username: arg1, password }
-
-    try {
-      const body = await this.login({ user })
-
-      return body.access_token
-    } catch (err) {
-      throw new Error(`Cannot authenticate. Please check your username/password. (${err})`)
-    }
-  }
-
-  loginUsingExternalToken (options: OverrideCommandOptions & {
-    username: string
-    externalAuthToken: string
-  }) {
-    const { username, externalAuthToken } = options
-    const path = '/api/v1/users/token'
-
-    const body = {
-      client_id: this.server.store.client.id,
-      client_secret: this.server.store.client.secret,
-      username,
-      response_type: 'code',
-      grant_type: 'password',
-      scope: 'upload',
-      externalAuthToken
-    }
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      requestType: 'form',
-      fields: body,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  logout (options: OverrideCommandOptions & {
-    token: string
-  }) {
-    const path = '/api/v1/users/revoke-token'
-
-    return unwrapBody<{ redirectUrl: string }>(this.postBodyRequest({
-      ...options,
-
-      path,
-      requestType: 'form',
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  refreshToken (options: OverrideCommandOptions & {
-    refreshToken: string
-  }) {
-    const path = '/api/v1/users/token'
-
-    const body = {
-      client_id: this.server.store.client.id,
-      client_secret: this.server.store.client.secret,
-      refresh_token: options.refreshToken,
-      response_type: 'code',
-      grant_type: 'refresh_token'
-    }
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      requestType: 'form',
-      fields: body,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getClient (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/oauth-clients/local'
-
-    return this.getRequestBody<{ client_id: string, client_secret: string }>({
-      ...options,
-
-      path,
-      host: this.server.host,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  private _login (options: LoginOptions) {
-    const { client = this.server.store.client, user = this.server.store.user, otpToken } = options
-    const path = '/api/v1/users/token'
-
-    const body = {
-      client_id: client.id,
-      client_secret: client.secret,
-      username: user.username,
-      password: user.password ?? 'password',
-      response_type: 'code',
-      grant_type: 'password',
-      scope: 'upload'
-    }
-
-    const headers = otpToken
-      ? { 'x-peertube-otp': otpToken }
-      : {}
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      headers,
-      requestType: 'form',
-      fields: body,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  private unwrapLoginBody (body: any) {
-    return body as { access_token: string, refresh_token: string } & PeerTubeProblemDocument
-  }
-}
diff --git a/shared/server-commands/users/login.ts b/shared/server-commands/users/login.ts
deleted file mode 100644
index f1df027d3..000000000
--- a/shared/server-commands/users/login.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { PeerTubeServer } from '../server/server'
-
-function setAccessTokensToServers (servers: PeerTubeServer[]) {
-  const tasks: Promise<any>[] = []
-
-  for (const server of servers) {
-    const p = server.login.getAccessToken()
-                                 .then(t => { server.accessToken = t })
-    tasks.push(p)
-  }
-
-  return Promise.all(tasks)
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  setAccessTokensToServers
-}
diff --git a/shared/server-commands/users/notifications-command.ts b/shared/server-commands/users/notifications-command.ts
deleted file mode 100644
index 6bd815daa..000000000
--- a/shared/server-commands/users/notifications-command.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { HttpStatusCode, ResultList, UserNotification, UserNotificationSetting } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class NotificationsCommand extends AbstractCommand {
-
-  updateMySettings (options: OverrideCommandOptions & {
-    settings: UserNotificationSetting
-  }) {
-    const path = '/api/v1/users/me/notification-settings'
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: options.settings,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  list (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    unread?: boolean
-    sort?: string
-  }) {
-    const { start, count, unread, sort = '-createdAt' } = options
-    const path = '/api/v1/users/me/notifications'
-
-    return this.getRequestBody<ResultList<UserNotification>>({
-      ...options,
-
-      path,
-      query: {
-        start,
-        count,
-        sort,
-        unread
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  markAsRead (options: OverrideCommandOptions & {
-    ids: number[]
-  }) {
-    const { ids } = options
-    const path = '/api/v1/users/me/notifications/read'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { ids },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  markAsReadAll (options: OverrideCommandOptions) {
-    const path = '/api/v1/users/me/notifications/read-all'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  async getLatest (options: OverrideCommandOptions = {}) {
-    const { total, data } = await this.list({
-      ...options,
-      start: 0,
-      count: 1,
-      sort: '-createdAt'
-    })
-
-    if (total === 0) return undefined
-
-    return data[0]
-  }
-}
diff --git a/shared/server-commands/users/registrations-command.ts b/shared/server-commands/users/registrations-command.ts
deleted file mode 100644
index f57f54b34..000000000
--- a/shared/server-commands/users/registrations-command.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { pick } from '@shared/core-utils'
-import { HttpStatusCode, ResultList, UserRegistration, UserRegistrationRequest, UserRegistrationUpdateState } from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class RegistrationsCommand extends AbstractCommand {
-
-  register (options: OverrideCommandOptions & Partial<UserRegistrationRequest> & Pick<UserRegistrationRequest, 'username'>) {
-    const { password = 'password', email = options.username + '@example.com' } = options
-    const path = '/api/v1/users/register'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: {
-        ...pick(options, [ 'username', 'displayName', 'channel' ]),
-
-        password,
-        email
-      },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  requestRegistration (
-    options: OverrideCommandOptions & Partial<UserRegistrationRequest> & Pick<UserRegistrationRequest, 'username' | 'registrationReason'>
-  ) {
-    const { password = 'password', email = options.username + '@example.com' } = options
-    const path = '/api/v1/users/registrations/request'
-
-    return unwrapBody<UserRegistration>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: {
-        ...pick(options, [ 'username', 'displayName', 'channel', 'registrationReason' ]),
-
-        password,
-        email
-      },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  // ---------------------------------------------------------------------------
-
-  accept (options: OverrideCommandOptions & { id: number } & UserRegistrationUpdateState) {
-    const { id } = options
-    const path = '/api/v1/users/registrations/' + id + '/accept'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'moderationResponse', 'preventEmailDelivery' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  reject (options: OverrideCommandOptions & { id: number } & UserRegistrationUpdateState) {
-    const { id } = options
-    const path = '/api/v1/users/registrations/' + id + '/reject'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'moderationResponse', 'preventEmailDelivery' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  delete (options: OverrideCommandOptions & {
-    id: number
-  }) {
-    const { id } = options
-    const path = '/api/v1/users/registrations/' + id
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  list (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    search?: string
-  } = {}) {
-    const path = '/api/v1/users/registrations'
-
-    return this.getRequestBody<ResultList<UserRegistration>>({
-      ...options,
-
-      path,
-      query: pick(options, [ 'start', 'count', 'sort', 'search' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  askSendVerifyEmail (options: OverrideCommandOptions & {
-    email: string
-  }) {
-    const { email } = options
-    const path = '/api/v1/users/registrations/ask-send-verify-email'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { email },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  verifyEmail (options: OverrideCommandOptions & {
-    registrationId: number
-    verificationString: string
-  }) {
-    const { registrationId, verificationString } = options
-    const path = '/api/v1/users/registrations/' + registrationId + '/verify-email'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: {
-        verificationString
-      },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/users/subscriptions-command.ts b/shared/server-commands/users/subscriptions-command.ts
deleted file mode 100644
index b92f037f8..000000000
--- a/shared/server-commands/users/subscriptions-command.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { HttpStatusCode, ResultList, VideoChannel } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class SubscriptionsCommand extends AbstractCommand {
-
-  add (options: OverrideCommandOptions & {
-    targetUri: string
-  }) {
-    const path = '/api/v1/users/me/subscriptions'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { uri: options.targetUri },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  list (options: OverrideCommandOptions & {
-    sort?: string // default -createdAt
-    search?: string
-  } = {}) {
-    const { sort = '-createdAt', search } = options
-    const path = '/api/v1/users/me/subscriptions'
-
-    return this.getRequestBody<ResultList<VideoChannel>>({
-      ...options,
-
-      path,
-      query: {
-        sort,
-        search
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  get (options: OverrideCommandOptions & {
-    uri: string
-  }) {
-    const path = '/api/v1/users/me/subscriptions/' + options.uri
-
-    return this.getRequestBody<VideoChannel>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  remove (options: OverrideCommandOptions & {
-    uri: string
-  }) {
-    const path = '/api/v1/users/me/subscriptions/' + options.uri
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  exist (options: OverrideCommandOptions & {
-    uris: string[]
-  }) {
-    const path = '/api/v1/users/me/subscriptions/exist'
-
-    return this.getRequestBody<{ [id: string ]: boolean }>({
-      ...options,
-
-      path,
-      query: { 'uris[]': options.uris },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/users/two-factor-command.ts b/shared/server-commands/users/two-factor-command.ts
deleted file mode 100644
index 5542acfda..000000000
--- a/shared/server-commands/users/two-factor-command.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { TOTP } from 'otpauth'
-import { HttpStatusCode, TwoFactorEnableResult } from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class TwoFactorCommand extends AbstractCommand {
-
-  static buildOTP (options: {
-    secret: string
-  }) {
-    const { secret } = options
-
-    return new TOTP({
-      issuer: 'PeerTube',
-      algorithm: 'SHA1',
-      digits: 6,
-      period: 30,
-      secret
-    })
-  }
-
-  request (options: OverrideCommandOptions & {
-    userId: number
-    currentPassword?: string
-  }) {
-    const { currentPassword, userId } = options
-
-    const path = '/api/v1/users/' + userId + '/two-factor/request'
-
-    return unwrapBody<TwoFactorEnableResult>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { currentPassword },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  confirmRequest (options: OverrideCommandOptions & {
-    userId: number
-    requestToken: string
-    otpToken: string
-  }) {
-    const { userId, requestToken, otpToken } = options
-
-    const path = '/api/v1/users/' + userId + '/two-factor/confirm-request'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { requestToken, otpToken },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  disable (options: OverrideCommandOptions & {
-    userId: number
-    currentPassword?: string
-  }) {
-    const { userId, currentPassword } = options
-    const path = '/api/v1/users/' + userId + '/two-factor/disable'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { currentPassword },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  async requestAndConfirm (options: OverrideCommandOptions & {
-    userId: number
-    currentPassword?: string
-  }) {
-    const { userId, currentPassword } = options
-
-    const { otpRequest } = await this.request({ userId, currentPassword })
-
-    await this.confirmRequest({
-      userId,
-      requestToken: otpRequest.requestToken,
-      otpToken: TwoFactorCommand.buildOTP({ secret: otpRequest.secret }).generate()
-    })
-
-    return otpRequest
-  }
-}
diff --git a/shared/server-commands/users/users-command.ts b/shared/server-commands/users/users-command.ts
deleted file mode 100644
index 5b39d3488..000000000
--- a/shared/server-commands/users/users-command.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-import { omit, pick } from '@shared/core-utils'
-import {
-  HttpStatusCode,
-  MyUser,
-  ResultList,
-  ScopedToken,
-  User,
-  UserAdminFlag,
-  UserCreateResult,
-  UserRole,
-  UserUpdate,
-  UserUpdateMe,
-  UserVideoQuota,
-  UserVideoRate
-} from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class UsersCommand extends AbstractCommand {
-
-  askResetPassword (options: OverrideCommandOptions & {
-    email: string
-  }) {
-    const { email } = options
-    const path = '/api/v1/users/ask-reset-password'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { email },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  resetPassword (options: OverrideCommandOptions & {
-    userId: number
-    verificationString: string
-    password: string
-  }) {
-    const { userId, verificationString, password } = options
-    const path = '/api/v1/users/' + userId + '/reset-password'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { password, verificationString },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  askSendVerifyEmail (options: OverrideCommandOptions & {
-    email: string
-  }) {
-    const { email } = options
-    const path = '/api/v1/users/ask-send-verify-email'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { email },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  verifyEmail (options: OverrideCommandOptions & {
-    userId: number
-    verificationString: string
-    isPendingEmail?: boolean // default false
-  }) {
-    const { userId, verificationString, isPendingEmail = false } = options
-    const path = '/api/v1/users/' + userId + '/verify-email'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: {
-        verificationString,
-        isPendingEmail
-      },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  banUser (options: OverrideCommandOptions & {
-    userId: number
-    reason?: string
-  }) {
-    const { userId, reason } = options
-    const path = '/api/v1/users' + '/' + userId + '/block'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { reason },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  unbanUser (options: OverrideCommandOptions & {
-    userId: number
-  }) {
-    const { userId } = options
-    const path = '/api/v1/users' + '/' + userId + '/unblock'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  getMyScopedTokens (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/users/scoped-tokens'
-
-    return this.getRequestBody<ScopedToken>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  renewMyScopedTokens (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/users/scoped-tokens'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  create (options: OverrideCommandOptions & {
-    username: string
-    password?: string
-    videoQuota?: number
-    videoQuotaDaily?: number
-    role?: UserRole
-    adminFlags?: UserAdminFlag
-  }) {
-    const {
-      username,
-      adminFlags,
-      password = 'password',
-      videoQuota,
-      videoQuotaDaily,
-      role = UserRole.USER
-    } = options
-
-    const path = '/api/v1/users'
-
-    return unwrapBody<{ user: UserCreateResult }>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: {
-        username,
-        password,
-        role,
-        adminFlags,
-        email: username + '@example.com',
-        videoQuota,
-        videoQuotaDaily
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })).then(res => res.user)
-  }
-
-  async generate (username: string, role?: UserRole) {
-    const password = 'password'
-    const user = await this.create({ username, password, role })
-
-    const token = await this.server.login.getAccessToken({ username, password })
-
-    const me = await this.getMyInfo({ token })
-
-    return {
-      token,
-      userId: user.id,
-      userChannelId: me.videoChannels[0].id,
-      userChannelName: me.videoChannels[0].name,
-      password
-    }
-  }
-
-  async generateUserAndToken (username: string, role?: UserRole) {
-    const password = 'password'
-    await this.create({ username, password, role })
-
-    return this.server.login.getAccessToken({ username, password })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  getMyInfo (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/users/me'
-
-    return this.getRequestBody<MyUser>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getMyQuotaUsed (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/users/me/video-quota-used'
-
-    return this.getRequestBody<UserVideoQuota>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getMyRating (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const { videoId } = options
-    const path = '/api/v1/users/me/videos/' + videoId + '/rating'
-
-    return this.getRequestBody<UserVideoRate>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  deleteMe (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/users/me'
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  updateMe (options: OverrideCommandOptions & UserUpdateMe) {
-    const path = '/api/v1/users/me'
-
-    const toSend: UserUpdateMe = omit(options, [ 'expectedStatus', 'token' ])
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: toSend,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  updateMyAvatar (options: OverrideCommandOptions & {
-    fixture: string
-  }) {
-    const { fixture } = options
-    const path = '/api/v1/users/me/avatar/pick'
-
-    return this.updateImageRequest({
-      ...options,
-
-      path,
-      fixture,
-      fieldname: 'avatarfile',
-
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  get (options: OverrideCommandOptions & {
-    userId: number
-    withStats?: boolean // default false
-  }) {
-    const { userId, withStats } = options
-    const path = '/api/v1/users/' + userId
-
-    return this.getRequestBody<User>({
-      ...options,
-
-      path,
-      query: { withStats },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  list (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    search?: string
-    blocked?: boolean
-  } = {}) {
-    const path = '/api/v1/users'
-
-    return this.getRequestBody<ResultList<User>>({
-      ...options,
-
-      path,
-      query: pick(options, [ 'start', 'count', 'sort', 'search', 'blocked' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  remove (options: OverrideCommandOptions & {
-    userId: number
-  }) {
-    const { userId } = options
-    const path = '/api/v1/users/' + userId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  update (options: OverrideCommandOptions & {
-    userId: number
-    email?: string
-    emailVerified?: boolean
-    videoQuota?: number
-    videoQuotaDaily?: number
-    password?: string
-    adminFlags?: UserAdminFlag
-    pluginAuth?: string
-    role?: UserRole
-  }) {
-    const path = '/api/v1/users/' + options.userId
-
-    const toSend: UserUpdate = {}
-    if (options.password !== undefined && options.password !== null) toSend.password = options.password
-    if (options.email !== undefined && options.email !== null) toSend.email = options.email
-    if (options.emailVerified !== undefined && options.emailVerified !== null) toSend.emailVerified = options.emailVerified
-    if (options.videoQuota !== undefined && options.videoQuota !== null) toSend.videoQuota = options.videoQuota
-    if (options.videoQuotaDaily !== undefined && options.videoQuotaDaily !== null) toSend.videoQuotaDaily = options.videoQuotaDaily
-    if (options.role !== undefined && options.role !== null) toSend.role = options.role
-    if (options.adminFlags !== undefined && options.adminFlags !== null) toSend.adminFlags = options.adminFlags
-    if (options.pluginAuth !== undefined) toSend.pluginAuth = options.pluginAuth
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: toSend,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/blacklist-command.ts b/shared/server-commands/videos/blacklist-command.ts
deleted file mode 100644
index 47e23ebc8..000000000
--- a/shared/server-commands/videos/blacklist-command.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-
-import { HttpStatusCode, ResultList, VideoBlacklist, VideoBlacklistType } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class BlacklistCommand extends AbstractCommand {
-
-  add (options: OverrideCommandOptions & {
-    videoId: number | string
-    reason?: string
-    unfederate?: boolean
-  }) {
-    const { videoId, reason, unfederate } = options
-    const path = '/api/v1/videos/' + videoId + '/blacklist'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { reason, unfederate },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  update (options: OverrideCommandOptions & {
-    videoId: number | string
-    reason?: string
-  }) {
-    const { videoId, reason } = options
-    const path = '/api/v1/videos/' + videoId + '/blacklist'
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: { reason },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  remove (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const { videoId } = options
-    const path = '/api/v1/videos/' + videoId + '/blacklist'
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  list (options: OverrideCommandOptions & {
-    sort?: string
-    type?: VideoBlacklistType
-  } = {}) {
-    const { sort, type } = options
-    const path = '/api/v1/videos/blacklist/'
-
-    const query = { sort, type }
-
-    return this.getRequestBody<ResultList<VideoBlacklist>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/videos/captions-command.ts b/shared/server-commands/videos/captions-command.ts
deleted file mode 100644
index a26fcb57d..000000000
--- a/shared/server-commands/videos/captions-command.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { buildAbsoluteFixturePath } from '@shared/core-utils'
-import { HttpStatusCode, ResultList, VideoCaption } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class CaptionsCommand extends AbstractCommand {
-
-  add (options: OverrideCommandOptions & {
-    videoId: string | number
-    language: string
-    fixture: string
-    mimeType?: string
-  }) {
-    const { videoId, language, fixture, mimeType } = options
-
-    const path = '/api/v1/videos/' + videoId + '/captions/' + language
-
-    const captionfile = buildAbsoluteFixturePath(fixture)
-    const captionfileAttach = mimeType
-      ? [ captionfile, { contentType: mimeType } ]
-      : captionfile
-
-    return this.putUploadRequest({
-      ...options,
-
-      path,
-      fields: {},
-      attaches: {
-        captionfile: captionfileAttach
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  list (options: OverrideCommandOptions & {
-    videoId: string | number
-    videoPassword?: string
-  }) {
-    const { videoId, videoPassword } = options
-    const path = '/api/v1/videos/' + videoId + '/captions'
-
-    return this.getRequestBody<ResultList<VideoCaption>>({
-      ...options,
-
-      path,
-      headers: this.buildVideoPasswordHeader(videoPassword),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  delete (options: OverrideCommandOptions & {
-    videoId: string | number
-    language: string
-  }) {
-    const { videoId, language } = options
-    const path = '/api/v1/videos/' + videoId + '/captions/' + language
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/change-ownership-command.ts b/shared/server-commands/videos/change-ownership-command.ts
deleted file mode 100644
index ad4c726ef..000000000
--- a/shared/server-commands/videos/change-ownership-command.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-
-import { HttpStatusCode, ResultList, VideoChangeOwnership } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class ChangeOwnershipCommand extends AbstractCommand {
-
-  create (options: OverrideCommandOptions & {
-    videoId: number | string
-    username: string
-  }) {
-    const { videoId, username } = options
-    const path = '/api/v1/videos/' + videoId + '/give-ownership'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { username },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  list (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/videos/ownership'
-
-    return this.getRequestBody<ResultList<VideoChangeOwnership>>({
-      ...options,
-
-      path,
-      query: { sort: '-createdAt' },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  accept (options: OverrideCommandOptions & {
-    ownershipId: number
-    channelId: number
-  }) {
-    const { ownershipId, channelId } = options
-    const path = '/api/v1/videos/ownership/' + ownershipId + '/accept'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { channelId },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  refuse (options: OverrideCommandOptions & {
-    ownershipId: number
-  }) {
-    const { ownershipId } = options
-    const path = '/api/v1/videos/ownership/' + ownershipId + '/refuse'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/channel-syncs-command.ts b/shared/server-commands/videos/channel-syncs-command.ts
deleted file mode 100644
index de4a160ec..000000000
--- a/shared/server-commands/videos/channel-syncs-command.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { HttpStatusCode, ResultList, VideoChannelSync, VideoChannelSyncCreate } from '@shared/models'
-import { pick } from '@shared/core-utils'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class ChannelSyncsCommand extends AbstractCommand {
-  private static readonly API_PATH = '/api/v1/video-channel-syncs'
-
-  listByAccount (options: OverrideCommandOptions & {
-    accountName: string
-    start?: number
-    count?: number
-    sort?: string
-  }) {
-    const { accountName, sort = 'createdAt' } = options
-
-    const path = `/api/v1/accounts/${accountName}/video-channel-syncs`
-
-    return this.getRequestBody<ResultList<VideoChannelSync>>({
-      ...options,
-
-      path,
-      query: { sort, ...pick(options, [ 'start', 'count' ]) },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  async create (options: OverrideCommandOptions & {
-    attributes: VideoChannelSyncCreate
-  }) {
-    return unwrapBody<{ videoChannelSync: VideoChannelSync }>(this.postBodyRequest({
-      ...options,
-
-      path: ChannelSyncsCommand.API_PATH,
-      fields: options.attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  delete (options: OverrideCommandOptions & {
-    channelSyncId: number
-  }) {
-    const path = `${ChannelSyncsCommand.API_PATH}/${options.channelSyncId}`
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/channels-command.ts b/shared/server-commands/videos/channels-command.ts
deleted file mode 100644
index 385d0fe73..000000000
--- a/shared/server-commands/videos/channels-command.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import { pick } from '@shared/core-utils'
-import {
-  ActorFollow,
-  HttpStatusCode,
-  ResultList,
-  VideoChannel,
-  VideoChannelCreate,
-  VideoChannelCreateResult,
-  VideoChannelUpdate,
-  VideosImportInChannelCreate
-} from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class ChannelsCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    withStats?: boolean
-  } = {}) {
-    const path = '/api/v1/video-channels'
-
-    return this.getRequestBody<ResultList<VideoChannel>>({
-      ...options,
-
-      path,
-      query: pick(options, [ 'start', 'count', 'sort', 'withStats' ]),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listByAccount (options: OverrideCommandOptions & {
-    accountName: string
-    start?: number
-    count?: number
-    sort?: string
-    withStats?: boolean
-    search?: string
-  }) {
-    const { accountName, sort = 'createdAt' } = options
-    const path = '/api/v1/accounts/' + accountName + '/video-channels'
-
-    return this.getRequestBody<ResultList<VideoChannel>>({
-      ...options,
-
-      path,
-      query: { sort, ...pick(options, [ 'start', 'count', 'withStats', 'search' ]) },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  async create (options: OverrideCommandOptions & {
-    attributes: Partial<VideoChannelCreate>
-  }) {
-    const path = '/api/v1/video-channels/'
-
-    // Default attributes
-    const defaultAttributes = {
-      displayName: 'my super video channel',
-      description: 'my super channel description',
-      support: 'my super channel support'
-    }
-    const attributes = { ...defaultAttributes, ...options.attributes }
-
-    const body = await unwrapBody<{ videoChannel: VideoChannelCreateResult }>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-
-    return body.videoChannel
-  }
-
-  update (options: OverrideCommandOptions & {
-    channelName: string
-    attributes: VideoChannelUpdate
-  }) {
-    const { channelName, attributes } = options
-    const path = '/api/v1/video-channels/' + channelName
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  delete (options: OverrideCommandOptions & {
-    channelName: string
-  }) {
-    const path = '/api/v1/video-channels/' + options.channelName
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  get (options: OverrideCommandOptions & {
-    channelName: string
-  }) {
-    const path = '/api/v1/video-channels/' + options.channelName
-
-    return this.getRequestBody<VideoChannel>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  updateImage (options: OverrideCommandOptions & {
-    fixture: string
-    channelName: string | number
-    type: 'avatar' | 'banner'
-  }) {
-    const { channelName, fixture, type } = options
-
-    const path = `/api/v1/video-channels/${channelName}/${type}/pick`
-
-    return this.updateImageRequest({
-      ...options,
-
-      path,
-      fixture,
-      fieldname: type + 'file',
-
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  deleteImage (options: OverrideCommandOptions & {
-    channelName: string | number
-    type: 'avatar' | 'banner'
-  }) {
-    const { channelName, type } = options
-
-    const path = `/api/v1/video-channels/${channelName}/${type}`
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  listFollowers (options: OverrideCommandOptions & {
-    channelName: string
-    start?: number
-    count?: number
-    sort?: string
-    search?: string
-  }) {
-    const { channelName, start, count, sort, search } = options
-    const path = '/api/v1/video-channels/' + channelName + '/followers'
-
-    const query = { start, count, sort, search }
-
-    return this.getRequestBody<ResultList<ActorFollow>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  importVideos (options: OverrideCommandOptions & VideosImportInChannelCreate & {
-    channelName: string
-  }) {
-    const { channelName, externalChannelUrl, videoChannelSyncId } = options
-
-    const path = `/api/v1/video-channels/${channelName}/import-videos`
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { externalChannelUrl, videoChannelSyncId },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/channels.ts b/shared/server-commands/videos/channels.ts
deleted file mode 100644
index 3c0d4b723..000000000
--- a/shared/server-commands/videos/channels.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { PeerTubeServer } from '../server/server'
-
-function setDefaultVideoChannel (servers: PeerTubeServer[]) {
-  const tasks: Promise<any>[] = []
-
-  for (const server of servers) {
-    const p = server.users.getMyInfo()
-      .then(user => { server.store.channel = user.videoChannels[0] })
-
-    tasks.push(p)
-  }
-
-  return Promise.all(tasks)
-}
-
-async function setDefaultChannelAvatar (serversArg: PeerTubeServer | PeerTubeServer[], channelName: string = 'root_channel') {
-  const servers = Array.isArray(serversArg)
-    ? serversArg
-    : [ serversArg ]
-
-  for (const server of servers) {
-    await server.channels.updateImage({ channelName, fixture: 'avatar.png', type: 'avatar' })
-  }
-}
-
-export {
-  setDefaultVideoChannel,
-  setDefaultChannelAvatar
-}
diff --git a/shared/server-commands/videos/comments-command.ts b/shared/server-commands/videos/comments-command.ts
deleted file mode 100644
index 0dab1b66a..000000000
--- a/shared/server-commands/videos/comments-command.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { pick } from '@shared/core-utils'
-import { HttpStatusCode, ResultList, VideoComment, VideoCommentThreads, VideoCommentThreadTree } from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class CommentsCommand extends AbstractCommand {
-
-  private lastVideoId: number | string
-  private lastThreadId: number
-  private lastReplyId: number
-
-  listForAdmin (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    isLocal?: boolean
-    onLocalVideo?: boolean
-    search?: string
-    searchAccount?: string
-    searchVideo?: string
-  } = {}) {
-    const { sort = '-createdAt' } = options
-    const path = '/api/v1/videos/comments'
-
-    const query = { sort, ...pick(options, [ 'start', 'count', 'isLocal', 'onLocalVideo', 'search', 'searchAccount', 'searchVideo' ]) }
-
-    return this.getRequestBody<ResultList<VideoComment>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listThreads (options: OverrideCommandOptions & {
-    videoId: number | string
-    videoPassword?: string
-    start?: number
-    count?: number
-    sort?: string
-  }) {
-    const { start, count, sort, videoId, videoPassword } = options
-    const path = '/api/v1/videos/' + videoId + '/comment-threads'
-
-    return this.getRequestBody<VideoCommentThreads>({
-      ...options,
-
-      path,
-      query: { start, count, sort },
-      headers: this.buildVideoPasswordHeader(videoPassword),
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getThread (options: OverrideCommandOptions & {
-    videoId: number | string
-    threadId: number
-  }) {
-    const { videoId, threadId } = options
-    const path = '/api/v1/videos/' + videoId + '/comment-threads/' + threadId
-
-    return this.getRequestBody<VideoCommentThreadTree>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  async createThread (options: OverrideCommandOptions & {
-    videoId: number | string
-    text: string
-    videoPassword?: string
-  }) {
-    const { videoId, text, videoPassword } = options
-    const path = '/api/v1/videos/' + videoId + '/comment-threads'
-
-    const body = await unwrapBody<{ comment: VideoComment }>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { text },
-      headers: this.buildVideoPasswordHeader(videoPassword),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-
-    this.lastThreadId = body.comment?.id
-    this.lastVideoId = videoId
-
-    return body.comment
-  }
-
-  async addReply (options: OverrideCommandOptions & {
-    videoId: number | string
-    toCommentId: number
-    text: string
-    videoPassword?: string
-  }) {
-    const { videoId, toCommentId, text, videoPassword } = options
-    const path = '/api/v1/videos/' + videoId + '/comments/' + toCommentId
-
-    const body = await unwrapBody<{ comment: VideoComment }>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { text },
-      headers: this.buildVideoPasswordHeader(videoPassword),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-
-    this.lastReplyId = body.comment?.id
-
-    return body.comment
-  }
-
-  async addReplyToLastReply (options: OverrideCommandOptions & {
-    text: string
-  }) {
-    return this.addReply({ ...options, videoId: this.lastVideoId, toCommentId: this.lastReplyId })
-  }
-
-  async addReplyToLastThread (options: OverrideCommandOptions & {
-    text: string
-  }) {
-    return this.addReply({ ...options, videoId: this.lastVideoId, toCommentId: this.lastThreadId })
-  }
-
-  async findCommentId (options: OverrideCommandOptions & {
-    videoId: number | string
-    text: string
-  }) {
-    const { videoId, text } = options
-    const { data } = await this.listThreads({ videoId, count: 25, sort: '-createdAt' })
-
-    return data.find(c => c.text === text).id
-  }
-
-  delete (options: OverrideCommandOptions & {
-    videoId: number | string
-    commentId: number
-  }) {
-    const { videoId, commentId } = options
-    const path = '/api/v1/videos/' + videoId + '/comments/' + commentId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/history-command.ts b/shared/server-commands/videos/history-command.ts
deleted file mode 100644
index d27afcff2..000000000
--- a/shared/server-commands/videos/history-command.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { HttpStatusCode, ResultList, Video } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class HistoryCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & {
-    search?: string
-  } = {}) {
-    const { search } = options
-    const path = '/api/v1/users/me/history/videos'
-
-    return this.getRequestBody<ResultList<Video>>({
-      ...options,
-
-      path,
-      query: {
-        search
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  removeElement (options: OverrideCommandOptions & {
-    videoId: number
-  }) {
-    const { videoId } = options
-    const path = '/api/v1/users/me/history/videos/' + videoId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  removeAll (options: OverrideCommandOptions & {
-    beforeDate?: string
-  } = {}) {
-    const { beforeDate } = options
-    const path = '/api/v1/users/me/history/videos/remove'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: { beforeDate },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/imports-command.ts b/shared/server-commands/videos/imports-command.ts
deleted file mode 100644
index e307a79be..000000000
--- a/shared/server-commands/videos/imports-command.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-
-import { HttpStatusCode, ResultList } from '@shared/models'
-import { VideoImport, VideoImportCreate } from '../../models/videos'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class ImportsCommand extends AbstractCommand {
-
-  importVideo (options: OverrideCommandOptions & {
-    attributes: (VideoImportCreate | { torrentfile?: string, previewfile?: string, thumbnailfile?: string })
-  }) {
-    const { attributes } = options
-    const path = '/api/v1/videos/imports'
-
-    let attaches: any = {}
-    if (attributes.torrentfile) attaches = { torrentfile: attributes.torrentfile }
-    if (attributes.thumbnailfile) attaches = { thumbnailfile: attributes.thumbnailfile }
-    if (attributes.previewfile) attaches = { previewfile: attributes.previewfile }
-
-    return unwrapBody<VideoImport>(this.postUploadRequest({
-      ...options,
-
-      path,
-      attaches,
-      fields: options.attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  delete (options: OverrideCommandOptions & {
-    importId: number
-  }) {
-    const path = '/api/v1/videos/imports/' + options.importId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  cancel (options: OverrideCommandOptions & {
-    importId: number
-  }) {
-    const path = '/api/v1/videos/imports/' + options.importId + '/cancel'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  getMyVideoImports (options: OverrideCommandOptions & {
-    sort?: string
-    targetUrl?: string
-    videoChannelSyncId?: number
-    search?: string
-  } = {}) {
-    const { sort, targetUrl, videoChannelSyncId, search } = options
-    const path = '/api/v1/users/me/videos/imports'
-
-    return this.getRequestBody<ResultList<VideoImport>>({
-      ...options,
-
-      path,
-      query: { sort, targetUrl, videoChannelSyncId, search },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/videos/index.ts b/shared/server-commands/videos/index.ts
deleted file mode 100644
index 106d80af0..000000000
--- a/shared/server-commands/videos/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export * from './blacklist-command'
-export * from './captions-command'
-export * from './change-ownership-command'
-export * from './channels'
-export * from './channels-command'
-export * from './channel-syncs-command'
-export * from './comments-command'
-export * from './history-command'
-export * from './imports-command'
-export * from './live-command'
-export * from './live'
-export * from './playlists-command'
-export * from './services-command'
-export * from './storyboard-command'
-export * from './streaming-playlists-command'
-export * from './comments-command'
-export * from './video-studio-command'
-export * from './video-token-command'
-export * from './views-command'
-export * from './videos-command'
-export * from './video-passwords-command'
diff --git a/shared/server-commands/videos/live-command.ts b/shared/server-commands/videos/live-command.ts
deleted file mode 100644
index 6006d9fe9..000000000
--- a/shared/server-commands/videos/live-command.ts
+++ /dev/null
@@ -1,337 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { readdir } from 'fs-extra'
-import { join } from 'path'
-import { omit, wait } from '@shared/core-utils'
-import {
-  HttpStatusCode,
-  LiveVideo,
-  LiveVideoCreate,
-  LiveVideoSession,
-  LiveVideoUpdate,
-  ResultList,
-  VideoCreateResult,
-  VideoDetails,
-  VideoPrivacy,
-  VideoState
-} from '@shared/models'
-import { unwrapBody } from '../requests'
-import { ObjectStorageCommand, PeerTubeServer } from '../server'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-import { sendRTMPStream, testFfmpegStreamError } from './live'
-
-export class LiveCommand extends AbstractCommand {
-
-  get (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const path = '/api/v1/videos/live'
-
-    return this.getRequestBody<LiveVideo>({
-      ...options,
-
-      path: path + '/' + options.videoId,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  listSessions (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const path = `/api/v1/videos/live/${options.videoId}/sessions`
-
-    return this.getRequestBody<ResultList<LiveVideoSession>>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  async findLatestSession (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const { data: sessions } = await this.listSessions(options)
-
-    return sessions[sessions.length - 1]
-  }
-
-  getReplaySession (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const path = `/api/v1/videos/${options.videoId}/live-session`
-
-    return this.getRequestBody<LiveVideoSession>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  update (options: OverrideCommandOptions & {
-    videoId: number | string
-    fields: LiveVideoUpdate
-  }) {
-    const { videoId, fields } = options
-    const path = '/api/v1/videos/live'
-
-    return this.putBodyRequest({
-      ...options,
-
-      path: path + '/' + videoId,
-      fields,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  async create (options: OverrideCommandOptions & {
-    fields: LiveVideoCreate
-  }) {
-    const { fields } = options
-    const path = '/api/v1/videos/live'
-
-    const attaches: any = {}
-    if (fields.thumbnailfile) attaches.thumbnailfile = fields.thumbnailfile
-    if (fields.previewfile) attaches.previewfile = fields.previewfile
-
-    const body = await unwrapBody<{ video: VideoCreateResult }>(this.postUploadRequest({
-      ...options,
-
-      path,
-      attaches,
-      fields: omit(fields, [ 'thumbnailfile', 'previewfile' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-
-    return body.video
-  }
-
-  async quickCreate (options: OverrideCommandOptions & {
-    saveReplay: boolean
-    permanentLive: boolean
-    privacy?: VideoPrivacy
-    videoPasswords?: string[]
-  }) {
-    const { saveReplay, permanentLive, privacy = VideoPrivacy.PUBLIC, videoPasswords } = options
-
-    const replaySettings = privacy === VideoPrivacy.PASSWORD_PROTECTED
-      ? { privacy: VideoPrivacy.PRIVATE }
-      : { privacy }
-
-    const { uuid } = await this.create({
-      ...options,
-
-      fields: {
-        name: 'live',
-        permanentLive,
-        saveReplay,
-        replaySettings,
-        channelId: this.server.store.channel.id,
-        privacy,
-        videoPasswords
-      }
-    })
-
-    const video = await this.server.videos.getWithToken({ id: uuid })
-    const live = await this.get({ videoId: uuid })
-
-    return { video, live }
-  }
-
-  // ---------------------------------------------------------------------------
-
-  async sendRTMPStreamInVideo (options: OverrideCommandOptions & {
-    videoId: number | string
-    fixtureName?: string
-    copyCodecs?: boolean
-  }) {
-    const { videoId, fixtureName, copyCodecs } = options
-    const videoLive = await this.get({ videoId })
-
-    return sendRTMPStream({ rtmpBaseUrl: videoLive.rtmpUrl, streamKey: videoLive.streamKey, fixtureName, copyCodecs })
-  }
-
-  async runAndTestStreamError (options: OverrideCommandOptions & {
-    videoId: number | string
-    shouldHaveError: boolean
-  }) {
-    const command = await this.sendRTMPStreamInVideo(options)
-
-    return testFfmpegStreamError(command, options.shouldHaveError)
-  }
-
-  // ---------------------------------------------------------------------------
-
-  waitUntilPublished (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const { videoId } = options
-    return this.waitUntilState({ videoId, state: VideoState.PUBLISHED })
-  }
-
-  waitUntilWaiting (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const { videoId } = options
-    return this.waitUntilState({ videoId, state: VideoState.WAITING_FOR_LIVE })
-  }
-
-  waitUntilEnded (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const { videoId } = options
-    return this.waitUntilState({ videoId, state: VideoState.LIVE_ENDED })
-  }
-
-  async waitUntilSegmentGeneration (options: OverrideCommandOptions & {
-    server: PeerTubeServer
-    videoUUID: string
-    playlistNumber: number
-    segment: number
-    objectStorage?: ObjectStorageCommand
-    objectStorageBaseUrl?: string
-  }) {
-    const {
-      server,
-      objectStorage,
-      playlistNumber,
-      segment,
-      videoUUID,
-      objectStorageBaseUrl
-    } = options
-
-    const segmentName = `${playlistNumber}-00000${segment}.ts`
-    const baseUrl = objectStorage
-      ? join(objectStorageBaseUrl || objectStorage.getMockPlaylistBaseUrl(), 'hls')
-      : server.url + '/static/streaming-playlists/hls'
-
-    let error = true
-
-    while (error) {
-      try {
-        // Check fragment exists
-        await this.getRawRequest({
-          ...options,
-
-          url: `${baseUrl}/${videoUUID}/${segmentName}`,
-          implicitToken: false,
-          defaultExpectedStatus: HttpStatusCode.OK_200
-        })
-
-        const video = await server.videos.get({ id: videoUUID })
-        const hlsPlaylist = video.streamingPlaylists[0]
-
-        // Check SHA generation
-        const shaBody = await server.streamingPlaylists.getSegmentSha256({ url: hlsPlaylist.segmentsSha256Url, withRetry: !!objectStorage })
-        if (!shaBody[segmentName]) {
-          throw new Error('Segment SHA does not exist')
-        }
-
-        // Check fragment is in m3u8 playlist
-        const subPlaylist = await server.streamingPlaylists.get({ url: `${baseUrl}/${video.uuid}/${playlistNumber}.m3u8` })
-        if (!subPlaylist.includes(segmentName)) throw new Error('Fragment does not exist in playlist')
-
-        error = false
-      } catch {
-        error = true
-        await wait(100)
-      }
-    }
-  }
-
-  async waitUntilReplacedByReplay (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    let video: VideoDetails
-
-    do {
-      video = await this.server.videos.getWithToken({ token: options.token, id: options.videoId })
-
-      await wait(500)
-    } while (video.isLive === true || video.state.id !== VideoState.PUBLISHED)
-  }
-
-  // ---------------------------------------------------------------------------
-
-  getSegmentFile (options: OverrideCommandOptions & {
-    videoUUID: string
-    playlistNumber: number
-    segment: number
-    objectStorage?: ObjectStorageCommand
-  }) {
-    const { playlistNumber, segment, videoUUID, objectStorage } = options
-
-    const segmentName = `${playlistNumber}-00000${segment}.ts`
-    const baseUrl = objectStorage
-      ? objectStorage.getMockPlaylistBaseUrl()
-      : `${this.server.url}/static/streaming-playlists/hls`
-
-    const url = `${baseUrl}/${videoUUID}/${segmentName}`
-
-    return this.getRawRequest({
-      ...options,
-
-      url,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getPlaylistFile (options: OverrideCommandOptions & {
-    videoUUID: string
-    playlistName: string
-    objectStorage?: ObjectStorageCommand
-  }) {
-    const { playlistName, videoUUID, objectStorage } = options
-
-    const baseUrl = objectStorage
-      ? objectStorage.getMockPlaylistBaseUrl()
-      : `${this.server.url}/static/streaming-playlists/hls`
-
-    const url = `${baseUrl}/${videoUUID}/${playlistName}`
-
-    return this.getRawRequest({
-      ...options,
-
-      url,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  async countPlaylists (options: OverrideCommandOptions & {
-    videoUUID: string
-  }) {
-    const basePath = this.server.servers.buildDirectory('streaming-playlists')
-    const hlsPath = join(basePath, 'hls', options.videoUUID)
-
-    const files = await readdir(hlsPath)
-
-    return files.filter(f => f.endsWith('.m3u8')).length
-  }
-
-  private async waitUntilState (options: OverrideCommandOptions & {
-    videoId: number | string
-    state: VideoState
-  }) {
-    let video: VideoDetails
-
-    do {
-      video = await this.server.videos.getWithToken({ token: options.token, id: options.videoId })
-
-      await wait(500)
-    } while (video.state.id !== options.state)
-  }
-}
diff --git a/shared/server-commands/videos/live.ts b/shared/server-commands/videos/live.ts
deleted file mode 100644
index cebadb1db..000000000
--- a/shared/server-commands/videos/live.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import ffmpeg, { FfmpegCommand } from 'fluent-ffmpeg'
-import { truncate } from 'lodash'
-import { buildAbsoluteFixturePath, wait } from '@shared/core-utils'
-import { VideoDetails, VideoInclude, VideoPrivacy } from '@shared/models'
-import { PeerTubeServer } from '../server/server'
-
-function sendRTMPStream (options: {
-  rtmpBaseUrl: string
-  streamKey: string
-  fixtureName?: string // default video_short.mp4
-  copyCodecs?: boolean // default false
-}) {
-  const { rtmpBaseUrl, streamKey, fixtureName = 'video_short.mp4', copyCodecs = false } = options
-
-  const fixture = buildAbsoluteFixturePath(fixtureName)
-
-  const command = ffmpeg(fixture)
-  command.inputOption('-stream_loop -1')
-  command.inputOption('-re')
-
-  if (copyCodecs) {
-    command.outputOption('-c copy')
-  } else {
-    command.outputOption('-c:v libx264')
-    command.outputOption('-g 120')
-    command.outputOption('-x264-params "no-scenecut=1"')
-    command.outputOption('-r 60')
-  }
-
-  command.outputOption('-f flv')
-
-  const rtmpUrl = rtmpBaseUrl + '/' + streamKey
-  command.output(rtmpUrl)
-
-  command.on('error', err => {
-    if (err?.message?.includes('Exiting normally')) return
-
-    if (process.env.DEBUG) console.error(err)
-  })
-
-  if (process.env.DEBUG) {
-    command.on('stderr', data => console.log(data))
-    command.on('stdout', data => console.log(data))
-  }
-
-  command.run()
-
-  return command
-}
-
-function waitFfmpegUntilError (command: FfmpegCommand, successAfterMS = 10000) {
-  return new Promise<void>((res, rej) => {
-    command.on('error', err => {
-      return rej(err)
-    })
-
-    setTimeout(() => {
-      res()
-    }, successAfterMS)
-  })
-}
-
-async function testFfmpegStreamError (command: FfmpegCommand, shouldHaveError: boolean) {
-  let error: Error
-
-  try {
-    await waitFfmpegUntilError(command, 45000)
-  } catch (err) {
-    error = err
-  }
-
-  await stopFfmpeg(command)
-
-  if (shouldHaveError && !error) throw new Error('Ffmpeg did not have an error')
-  if (!shouldHaveError && error) throw error
-}
-
-async function stopFfmpeg (command: FfmpegCommand) {
-  command.kill('SIGINT')
-
-  await wait(500)
-}
-
-async function waitUntilLivePublishedOnAllServers (servers: PeerTubeServer[], videoId: string) {
-  for (const server of servers) {
-    await server.live.waitUntilPublished({ videoId })
-  }
-}
-
-async function waitUntilLiveWaitingOnAllServers (servers: PeerTubeServer[], videoId: string) {
-  for (const server of servers) {
-    await server.live.waitUntilWaiting({ videoId })
-  }
-}
-
-async function waitUntilLiveReplacedByReplayOnAllServers (servers: PeerTubeServer[], videoId: string) {
-  for (const server of servers) {
-    await server.live.waitUntilReplacedByReplay({ videoId })
-  }
-}
-
-async function findExternalSavedVideo (server: PeerTubeServer, liveDetails: VideoDetails) {
-  const include = VideoInclude.BLACKLISTED
-  const privacyOneOf = [ VideoPrivacy.INTERNAL, VideoPrivacy.PRIVATE, VideoPrivacy.PUBLIC, VideoPrivacy.UNLISTED ]
-
-  const { data } = await server.videos.list({ token: server.accessToken, sort: '-publishedAt', include, privacyOneOf })
-
-  const videoNameSuffix = ` - ${new Date(liveDetails.publishedAt).toLocaleString()}`
-  const truncatedVideoName = truncate(liveDetails.name, {
-    length: 120 - videoNameSuffix.length
-  })
-  const toFind = truncatedVideoName + videoNameSuffix
-
-  return data.find(v => v.name === toFind)
-}
-
-export {
-  sendRTMPStream,
-  waitFfmpegUntilError,
-  testFfmpegStreamError,
-  stopFfmpeg,
-
-  waitUntilLivePublishedOnAllServers,
-  waitUntilLiveReplacedByReplayOnAllServers,
-  waitUntilLiveWaitingOnAllServers,
-
-  findExternalSavedVideo
-}
diff --git a/shared/server-commands/videos/playlists-command.ts b/shared/server-commands/videos/playlists-command.ts
deleted file mode 100644
index da3bef7b0..000000000
--- a/shared/server-commands/videos/playlists-command.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-import { omit, pick } from '@shared/core-utils'
-import {
-  BooleanBothQuery,
-  HttpStatusCode,
-  ResultList,
-  VideoExistInPlaylist,
-  VideoPlaylist,
-  VideoPlaylistCreate,
-  VideoPlaylistCreateResult,
-  VideoPlaylistElement,
-  VideoPlaylistElementCreate,
-  VideoPlaylistElementCreateResult,
-  VideoPlaylistElementUpdate,
-  VideoPlaylistReorder,
-  VideoPlaylistType,
-  VideoPlaylistUpdate
-} from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class PlaylistsCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    playlistType?: VideoPlaylistType
-  }) {
-    const path = '/api/v1/video-playlists'
-    const query = pick(options, [ 'start', 'count', 'sort', 'playlistType' ])
-
-    return this.getRequestBody<ResultList<VideoPlaylist>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listByChannel (options: OverrideCommandOptions & {
-    handle: string
-    start?: number
-    count?: number
-    sort?: string
-    playlistType?: VideoPlaylistType
-  }) {
-    const path = '/api/v1/video-channels/' + options.handle + '/video-playlists'
-    const query = pick(options, [ 'start', 'count', 'sort', 'playlistType' ])
-
-    return this.getRequestBody<ResultList<VideoPlaylist>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listByAccount (options: OverrideCommandOptions & {
-    handle: string
-    start?: number
-    count?: number
-    sort?: string
-    search?: string
-    playlistType?: VideoPlaylistType
-  }) {
-    const path = '/api/v1/accounts/' + options.handle + '/video-playlists'
-    const query = pick(options, [ 'start', 'count', 'sort', 'search', 'playlistType' ])
-
-    return this.getRequestBody<ResultList<VideoPlaylist>>({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  get (options: OverrideCommandOptions & {
-    playlistId: number | string
-  }) {
-    const { playlistId } = options
-    const path = '/api/v1/video-playlists/' + playlistId
-
-    return this.getRequestBody<VideoPlaylist>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listVideos (options: OverrideCommandOptions & {
-    playlistId: number | string
-    start?: number
-    count?: number
-    query?: { nsfw?: BooleanBothQuery }
-  }) {
-    const path = '/api/v1/video-playlists/' + options.playlistId + '/videos'
-    const query = options.query ?? {}
-
-    return this.getRequestBody<ResultList<VideoPlaylistElement>>({
-      ...options,
-
-      path,
-      query: {
-        ...query,
-        start: options.start,
-        count: options.count
-      },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  delete (options: OverrideCommandOptions & {
-    playlistId: number | string
-  }) {
-    const path = '/api/v1/video-playlists/' + options.playlistId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  async create (options: OverrideCommandOptions & {
-    attributes: VideoPlaylistCreate
-  }) {
-    const path = '/api/v1/video-playlists'
-
-    const fields = omit(options.attributes, [ 'thumbnailfile' ])
-
-    const attaches = options.attributes.thumbnailfile
-      ? { thumbnailfile: options.attributes.thumbnailfile }
-      : {}
-
-    const body = await unwrapBody<{ videoPlaylist: VideoPlaylistCreateResult }>(this.postUploadRequest({
-      ...options,
-
-      path,
-      fields,
-      attaches,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-
-    return body.videoPlaylist
-  }
-
-  update (options: OverrideCommandOptions & {
-    attributes: VideoPlaylistUpdate
-    playlistId: number | string
-  }) {
-    const path = '/api/v1/video-playlists/' + options.playlistId
-
-    const fields = omit(options.attributes, [ 'thumbnailfile' ])
-
-    const attaches = options.attributes.thumbnailfile
-      ? { thumbnailfile: options.attributes.thumbnailfile }
-      : {}
-
-    return this.putUploadRequest({
-      ...options,
-
-      path,
-      fields,
-      attaches,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  async addElement (options: OverrideCommandOptions & {
-    playlistId: number | string
-    attributes: VideoPlaylistElementCreate | { videoId: string }
-  }) {
-    const attributes = {
-      ...options.attributes,
-
-      videoId: await this.server.videos.getId({ ...options, uuid: options.attributes.videoId })
-    }
-
-    const path = '/api/v1/video-playlists/' + options.playlistId + '/videos'
-
-    const body = await unwrapBody<{ videoPlaylistElement: VideoPlaylistElementCreateResult }>(this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-
-    return body.videoPlaylistElement
-  }
-
-  updateElement (options: OverrideCommandOptions & {
-    playlistId: number | string
-    elementId: number | string
-    attributes: VideoPlaylistElementUpdate
-  }) {
-    const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/' + options.elementId
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: options.attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  removeElement (options: OverrideCommandOptions & {
-    playlistId: number | string
-    elementId: number
-  }) {
-    const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/' + options.elementId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  reorderElements (options: OverrideCommandOptions & {
-    playlistId: number | string
-    attributes: VideoPlaylistReorder
-  }) {
-    const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/reorder'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: options.attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  getPrivacies (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/video-playlists/privacies'
-
-    return this.getRequestBody<{ [ id: number ]: string }>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  videosExist (options: OverrideCommandOptions & {
-    videoIds: number[]
-  }) {
-    const { videoIds } = options
-    const path = '/api/v1/users/me/video-playlists/videos-exist'
-
-    return this.getRequestBody<VideoExistInPlaylist>({
-      ...options,
-
-      path,
-      query: { videoIds },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/videos/services-command.ts b/shared/server-commands/videos/services-command.ts
deleted file mode 100644
index 06760df42..000000000
--- a/shared/server-commands/videos/services-command.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { HttpStatusCode } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class ServicesCommand extends AbstractCommand {
-
-  getOEmbed (options: OverrideCommandOptions & {
-    oembedUrl: string
-    format?: string
-    maxHeight?: number
-    maxWidth?: number
-  }) {
-    const path = '/services/oembed'
-    const query = {
-      url: options.oembedUrl,
-      format: options.format,
-      maxheight: options.maxHeight,
-      maxwidth: options.maxWidth
-    }
-
-    return this.getRequest({
-      ...options,
-
-      path,
-      query,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/videos/storyboard-command.ts b/shared/server-commands/videos/storyboard-command.ts
deleted file mode 100644
index 06d90fc12..000000000
--- a/shared/server-commands/videos/storyboard-command.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { HttpStatusCode, Storyboard } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class StoryboardCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & {
-    id: number | string
-  }) {
-    const path = '/api/v1/videos/' + options.id + '/storyboards'
-
-    return this.getRequestBody<{ storyboards: Storyboard[] }>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/videos/streaming-playlists-command.ts b/shared/server-commands/videos/streaming-playlists-command.ts
deleted file mode 100644
index b988ac4b2..000000000
--- a/shared/server-commands/videos/streaming-playlists-command.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { wait } from '@shared/core-utils'
-import { HttpStatusCode } from '@shared/models'
-import { unwrapBody, unwrapBodyOrDecodeToJSON, unwrapTextOrDecode } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class StreamingPlaylistsCommand extends AbstractCommand {
-
-  async get (options: OverrideCommandOptions & {
-    url: string
-
-    videoFileToken?: string
-    reinjectVideoFileToken?: boolean
-
-    withRetry?: boolean // default false
-    currentRetry?: number
-  }): Promise<string> {
-    const { videoFileToken, reinjectVideoFileToken, expectedStatus, withRetry = false, currentRetry = 1 } = options
-
-    try {
-      const result = await unwrapTextOrDecode(this.getRawRequest({
-        ...options,
-
-        url: options.url,
-        query: {
-          videoFileToken,
-          reinjectVideoFileToken
-        },
-        implicitToken: false,
-        defaultExpectedStatus: HttpStatusCode.OK_200
-      }))
-
-      // master.m3u8 could be empty
-      if (!result && (!expectedStatus || expectedStatus === HttpStatusCode.OK_200)) {
-        throw new Error('Empty result')
-      }
-
-      return result
-    } catch (err) {
-      if (!withRetry || currentRetry > 10) throw err
-
-      await wait(250)
-
-      return this.get({
-        ...options,
-
-        withRetry,
-        currentRetry: currentRetry + 1
-      })
-    }
-  }
-
-  async getFragmentedSegment (options: OverrideCommandOptions & {
-    url: string
-    range?: string
-
-    withRetry?: boolean // default false
-    currentRetry?: number
-  }) {
-    const { withRetry = false, currentRetry = 1 } = options
-
-    try {
-      const result = await unwrapBody<Buffer>(this.getRawRequest({
-        ...options,
-
-        url: options.url,
-        range: options.range,
-        implicitToken: false,
-        responseType: 'application/octet-stream',
-        defaultExpectedStatus: HttpStatusCode.OK_200
-      }))
-
-      return result
-    } catch (err) {
-      if (!withRetry || currentRetry > 10) throw err
-
-      await wait(250)
-
-      return this.getFragmentedSegment({
-        ...options,
-
-        withRetry,
-        currentRetry: currentRetry + 1
-      })
-    }
-  }
-
-  async getSegmentSha256 (options: OverrideCommandOptions & {
-    url: string
-
-    withRetry?: boolean // default false
-    currentRetry?: number
-  }) {
-    const { withRetry = false, currentRetry = 1 } = options
-
-    try {
-      const result = await unwrapBodyOrDecodeToJSON<{ [ id: string ]: string }>(this.getRawRequest({
-        ...options,
-
-        url: options.url,
-        contentType: 'application/json',
-        implicitToken: false,
-        defaultExpectedStatus: HttpStatusCode.OK_200
-      }))
-
-      return result
-    } catch (err) {
-      if (!withRetry || currentRetry > 10) throw err
-
-      await wait(250)
-
-      return this.getSegmentSha256({
-        ...options,
-
-        withRetry,
-        currentRetry: currentRetry + 1
-      })
-    }
-  }
-}
diff --git a/shared/server-commands/videos/video-passwords-command.ts b/shared/server-commands/videos/video-passwords-command.ts
deleted file mode 100644
index bf10335b4..000000000
--- a/shared/server-commands/videos/video-passwords-command.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { HttpStatusCode, ResultList, VideoPassword } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-export class VideoPasswordsCommand extends AbstractCommand {
-
-  list (options: OverrideCommandOptions & {
-    videoId: number | string
-    start?: number
-    count?: number
-    sort?: string
-  }) {
-    const { start, count, sort, videoId } = options
-    const path = '/api/v1/videos/' + videoId + '/passwords'
-
-    return this.getRequestBody<ResultList<VideoPassword>>({
-      ...options,
-
-      path,
-      query: { start, count, sort },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  updateAll (options: OverrideCommandOptions & {
-    videoId: number | string
-    passwords: string[]
-  }) {
-    const { videoId, passwords } = options
-    const path = `/api/v1/videos/${videoId}/passwords`
-
-    return this.putBodyRequest({
-      ...options,
-      path,
-      fields: { passwords },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  remove (options: OverrideCommandOptions & {
-    id: number
-    videoId: number | string
-  }) {
-    const { id, videoId } = options
-    const path = `/api/v1/videos/${videoId}/passwords/${id}`
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/video-stats-command.ts b/shared/server-commands/videos/video-stats-command.ts
deleted file mode 100644
index b9b99bfb5..000000000
--- a/shared/server-commands/videos/video-stats-command.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { pick } from '@shared/core-utils'
-import { HttpStatusCode, VideoStatsOverall, VideoStatsRetention, VideoStatsTimeserie, VideoStatsTimeserieMetric } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class VideoStatsCommand extends AbstractCommand {
-
-  getOverallStats (options: OverrideCommandOptions & {
-    videoId: number | string
-    startDate?: string
-    endDate?: string
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/stats/overall'
-
-    return this.getRequestBody<VideoStatsOverall>({
-      ...options,
-      path,
-
-      query: pick(options, [ 'startDate', 'endDate' ]),
-
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getTimeserieStats (options: OverrideCommandOptions & {
-    videoId: number | string
-    metric: VideoStatsTimeserieMetric
-    startDate?: Date
-    endDate?: Date
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/stats/timeseries/' + options.metric
-
-    return this.getRequestBody<VideoStatsTimeserie>({
-      ...options,
-      path,
-
-      query: pick(options, [ 'startDate', 'endDate' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getRetentionStats (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/stats/retention'
-
-    return this.getRequestBody<VideoStatsRetention>({
-      ...options,
-      path,
-
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-}
diff --git a/shared/server-commands/videos/video-studio-command.ts b/shared/server-commands/videos/video-studio-command.ts
deleted file mode 100644
index 675cd84b7..000000000
--- a/shared/server-commands/videos/video-studio-command.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { HttpStatusCode, VideoStudioTask } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class VideoStudioCommand extends AbstractCommand {
-
-  static getComplexTask (): VideoStudioTask[] {
-    return [
-      // Total duration: 2
-      {
-        name: 'cut',
-        options: {
-          start: 1,
-          end: 3
-        }
-      },
-
-      // Total duration: 7
-      {
-        name: 'add-outro',
-        options: {
-          file: 'video_short.webm'
-        }
-      },
-
-      {
-        name: 'add-watermark',
-        options: {
-          file: 'custom-thumbnail.png'
-        }
-      },
-
-      // Total duration: 9
-      {
-        name: 'add-intro',
-        options: {
-          file: 'video_very_short_240p.mp4'
-        }
-      }
-    ]
-  }
-
-  createEditionTasks (options: OverrideCommandOptions & {
-    videoId: number | string
-    tasks: VideoStudioTask[]
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/studio/edit'
-    const attaches: { [id: string]: any } = {}
-
-    for (let i = 0; i < options.tasks.length; i++) {
-      const task = options.tasks[i]
-
-      if (task.name === 'add-intro' || task.name === 'add-outro' || task.name === 'add-watermark') {
-        attaches[`tasks[${i}][options][file]`] = task.options.file
-      }
-    }
-
-    return this.postUploadRequest({
-      ...options,
-
-      path,
-      attaches,
-      fields: { tasks: options.tasks },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-}
diff --git a/shared/server-commands/videos/video-token-command.ts b/shared/server-commands/videos/video-token-command.ts
deleted file mode 100644
index c4ed29a8c..000000000
--- a/shared/server-commands/videos/video-token-command.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */
-
-import { HttpStatusCode, VideoToken } from '@shared/models'
-import { unwrapBody } from '../requests'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class VideoTokenCommand extends AbstractCommand {
-
-  create (options: OverrideCommandOptions & {
-    videoId: number | string
-    videoPassword?: string
-  }) {
-    const { videoId, videoPassword } = options
-    const path = '/api/v1/videos/' + videoId + '/token'
-
-    return unwrapBody<VideoToken>(this.postBodyRequest({
-      ...options,
-      headers: this.buildVideoPasswordHeader(videoPassword),
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  async getVideoFileToken (options: OverrideCommandOptions & {
-    videoId: number | string
-    videoPassword?: string
-  }) {
-    const { files } = await this.create(options)
-
-    return files.token
-  }
-}
diff --git a/shared/server-commands/videos/videos-command.ts b/shared/server-commands/videos/videos-command.ts
deleted file mode 100644
index 4c3513ed4..000000000
--- a/shared/server-commands/videos/videos-command.ts
+++ /dev/null
@@ -1,829 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */
-
-import { expect } from 'chai'
-import { createReadStream, stat } from 'fs-extra'
-import got, { Response as GotResponse } from 'got'
-import validator from 'validator'
-import { buildAbsoluteFixturePath, getAllPrivacies, omit, pick, wait } from '@shared/core-utils'
-import { buildUUID } from '@shared/extra-utils'
-import {
-  HttpStatusCode,
-  ResultList,
-  UserVideoRateType,
-  Video,
-  VideoCreate,
-  VideoCreateResult,
-  VideoDetails,
-  VideoFileMetadata,
-  VideoInclude,
-  VideoPrivacy,
-  VideosCommonQuery,
-  VideoTranscodingCreate
-} from '@shared/models'
-import { VideoSource } from '@shared/models/videos/video-source'
-import { unwrapBody } from '../requests'
-import { waitJobs } from '../server'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile'>> & {
-  fixture?: string
-  thumbnailfile?: string
-  previewfile?: string
-}
-
-export class VideosCommand extends AbstractCommand {
-
-  getCategories (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/videos/categories'
-
-    return this.getRequestBody<{ [id: number]: string }>({
-      ...options,
-      path,
-
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getLicences (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/videos/licences'
-
-    return this.getRequestBody<{ [id: number]: string }>({
-      ...options,
-      path,
-
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getLanguages (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/videos/languages'
-
-    return this.getRequestBody<{ [id: string]: string }>({
-      ...options,
-      path,
-
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getPrivacies (options: OverrideCommandOptions = {}) {
-    const path = '/api/v1/videos/privacies'
-
-    return this.getRequestBody<{ [id in VideoPrivacy]: string }>({
-      ...options,
-      path,
-
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  getDescription (options: OverrideCommandOptions & {
-    descriptionPath: string
-  }) {
-    return this.getRequestBody<{ description: string }>({
-      ...options,
-      path: options.descriptionPath,
-
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getFileMetadata (options: OverrideCommandOptions & {
-    url: string
-  }) {
-    return unwrapBody<VideoFileMetadata>(this.getRawRequest({
-      ...options,
-
-      url: options.url,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    }))
-  }
-
-  // ---------------------------------------------------------------------------
-
-  rate (options: OverrideCommandOptions & {
-    id: number | string
-    rating: UserVideoRateType
-    videoPassword?: string
-  }) {
-    const { id, rating, videoPassword } = options
-    const path = '/api/v1/videos/' + id + '/rate'
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: { rating },
-      headers: this.buildVideoPasswordHeader(videoPassword),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  get (options: OverrideCommandOptions & {
-    id: number | string
-  }) {
-    const path = '/api/v1/videos/' + options.id
-
-    return this.getRequestBody<VideoDetails>({
-      ...options,
-
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getWithToken (options: OverrideCommandOptions & {
-    id: number | string
-  }) {
-    return this.get({
-      ...options,
-
-      token: this.buildCommonRequestToken({ ...options, implicitToken: true })
-    })
-  }
-
-  getWithPassword (options: OverrideCommandOptions & {
-    id: number | string
-    password?: string
-  }) {
-    const path = '/api/v1/videos/' + options.id
-
-    return this.getRequestBody<VideoDetails>({
-      ...options,
-      headers:{
-        'x-peertube-video-password': options.password
-      },
-      path,
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  getSource (options: OverrideCommandOptions & {
-    id: number | string
-  }) {
-    const path = '/api/v1/videos/' + options.id + '/source'
-
-    return this.getRequestBody<VideoSource>({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  async getId (options: OverrideCommandOptions & {
-    uuid: number | string
-  }) {
-    const { uuid } = options
-
-    if (validator.isUUID('' + uuid) === false) return uuid as number
-
-    const { id } = await this.get({ ...options, id: uuid })
-
-    return id
-  }
-
-  async listFiles (options: OverrideCommandOptions & {
-    id: number | string
-  }) {
-    const video = await this.get(options)
-
-    const files = video.files || []
-    const hlsFiles = video.streamingPlaylists[0]?.files || []
-
-    return files.concat(hlsFiles)
-  }
-
-  // ---------------------------------------------------------------------------
-
-  listMyVideos (options: OverrideCommandOptions & {
-    start?: number
-    count?: number
-    sort?: string
-    search?: string
-    isLive?: boolean
-    channelId?: number
-  } = {}) {
-    const path = '/api/v1/users/me/videos'
-
-    return this.getRequestBody<ResultList<Video>>({
-      ...options,
-
-      path,
-      query: pick(options, [ 'start', 'count', 'sort', 'search', 'isLive', 'channelId' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listMySubscriptionVideos (options: OverrideCommandOptions & VideosCommonQuery = {}) {
-    const { sort = '-createdAt' } = options
-    const path = '/api/v1/users/me/subscriptions/videos'
-
-    return this.getRequestBody<ResultList<Video>>({
-      ...options,
-
-      path,
-      query: { sort, ...this.buildListQuery(options) },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  list (options: OverrideCommandOptions & VideosCommonQuery = {}) {
-    const path = '/api/v1/videos'
-
-    const query = this.buildListQuery(options)
-
-    return this.getRequestBody<ResultList<Video>>({
-      ...options,
-
-      path,
-      query: { sort: 'name', ...query },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listWithToken (options: OverrideCommandOptions & VideosCommonQuery = {}) {
-    return this.list({
-      ...options,
-
-      token: this.buildCommonRequestToken({ ...options, implicitToken: true })
-    })
-  }
-
-  listAllForAdmin (options: OverrideCommandOptions & VideosCommonQuery = {}) {
-    const include = VideoInclude.NOT_PUBLISHED_STATE | VideoInclude.BLACKLISTED | VideoInclude.BLOCKED_OWNER
-    const nsfw = 'both'
-    const privacyOneOf = getAllPrivacies()
-
-    return this.list({
-      ...options,
-
-      include,
-      nsfw,
-      privacyOneOf,
-
-      token: this.buildCommonRequestToken({ ...options, implicitToken: true })
-    })
-  }
-
-  listByAccount (options: OverrideCommandOptions & VideosCommonQuery & {
-    handle: string
-  }) {
-    const { handle, search } = options
-    const path = '/api/v1/accounts/' + handle + '/videos'
-
-    return this.getRequestBody<ResultList<Video>>({
-      ...options,
-
-      path,
-      query: { search, ...this.buildListQuery(options) },
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  listByChannel (options: OverrideCommandOptions & VideosCommonQuery & {
-    handle: string
-  }) {
-    const { handle } = options
-    const path = '/api/v1/video-channels/' + handle + '/videos'
-
-    return this.getRequestBody<ResultList<Video>>({
-      ...options,
-
-      path,
-      query: this.buildListQuery(options),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  async find (options: OverrideCommandOptions & {
-    name: string
-  }) {
-    const { data } = await this.list(options)
-
-    return data.find(v => v.name === options.name)
-  }
-
-  // ---------------------------------------------------------------------------
-
-  update (options: OverrideCommandOptions & {
-    id: number | string
-    attributes?: VideoEdit
-  }) {
-    const { id, attributes = {} } = options
-    const path = '/api/v1/videos/' + id
-
-    // Upload request
-    if (attributes.thumbnailfile || attributes.previewfile) {
-      const attaches: any = {}
-      if (attributes.thumbnailfile) attaches.thumbnailfile = attributes.thumbnailfile
-      if (attributes.previewfile) attaches.previewfile = attributes.previewfile
-
-      return this.putUploadRequest({
-        ...options,
-
-        path,
-        fields: options.attributes,
-        attaches: {
-          thumbnailfile: attributes.thumbnailfile,
-          previewfile: attributes.previewfile
-        },
-        implicitToken: true,
-        defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-      })
-    }
-
-    return this.putBodyRequest({
-      ...options,
-
-      path,
-      fields: options.attributes,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  remove (options: OverrideCommandOptions & {
-    id: number | string
-  }) {
-    const path = '/api/v1/videos/' + options.id
-
-    return unwrapBody(this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    }))
-  }
-
-  async removeAll () {
-    const { data } = await this.list()
-
-    for (const v of data) {
-      await this.remove({ id: v.id })
-    }
-  }
-
-  // ---------------------------------------------------------------------------
-
-  async upload (options: OverrideCommandOptions & {
-    attributes?: VideoEdit
-    mode?: 'legacy' | 'resumable' // default legacy
-    waitTorrentGeneration?: boolean // default true
-    completedExpectedStatus?: HttpStatusCode
-  } = {}) {
-    const { mode = 'legacy', waitTorrentGeneration = true } = options
-    let defaultChannelId = 1
-
-    try {
-      const { videoChannels } = await this.server.users.getMyInfo({ token: options.token })
-      defaultChannelId = videoChannels[0].id
-    } catch (e) { /* empty */ }
-
-    // Override default attributes
-    const attributes = {
-      name: 'my super video',
-      category: 5,
-      licence: 4,
-      language: 'zh',
-      channelId: defaultChannelId,
-      nsfw: true,
-      waitTranscoding: false,
-      description: 'my super description',
-      support: 'my super support text',
-      tags: [ 'tag' ],
-      privacy: VideoPrivacy.PUBLIC,
-      commentsEnabled: true,
-      downloadEnabled: true,
-      fixture: 'video_short.webm',
-
-      ...options.attributes
-    }
-
-    const created = mode === 'legacy'
-      ? await this.buildLegacyUpload({ ...options, attributes })
-      : await this.buildResumeUpload({ ...options, path: '/api/v1/videos/upload-resumable', attributes })
-
-    // Wait torrent generation
-    const expectedStatus = this.buildExpectedStatus({ ...options, defaultExpectedStatus: HttpStatusCode.OK_200 })
-    if (expectedStatus === HttpStatusCode.OK_200 && waitTorrentGeneration) {
-      let video: VideoDetails
-
-      do {
-        video = await this.getWithToken({ ...options, id: created.uuid })
-
-        await wait(50)
-      } while (!video.files[0].torrentUrl)
-    }
-
-    return created
-  }
-
-  async buildLegacyUpload (options: OverrideCommandOptions & {
-    attributes: VideoEdit
-  }): Promise<VideoCreateResult> {
-    const path = '/api/v1/videos/upload'
-
-    return unwrapBody<{ video: VideoCreateResult }>(this.postUploadRequest({
-      ...options,
-
-      path,
-      fields: this.buildUploadFields(options.attributes),
-      attaches: this.buildUploadAttaches(options.attributes),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.OK_200
-    })).then(body => body.video || body as any)
-  }
-
-  async buildResumeUpload (options: OverrideCommandOptions & {
-    path: string
-    attributes: { fixture?: string } & { [id: string]: any }
-    completedExpectedStatus?: HttpStatusCode // When the upload is finished
-  }): Promise<VideoCreateResult> {
-    const { path, attributes, expectedStatus = HttpStatusCode.OK_200, completedExpectedStatus } = options
-
-    let size = 0
-    let videoFilePath: string
-    let mimetype = 'video/mp4'
-
-    if (attributes.fixture) {
-      videoFilePath = buildAbsoluteFixturePath(attributes.fixture)
-      size = (await stat(videoFilePath)).size
-
-      if (videoFilePath.endsWith('.mkv')) {
-        mimetype = 'video/x-matroska'
-      } else if (videoFilePath.endsWith('.webm')) {
-        mimetype = 'video/webm'
-      }
-    }
-
-    // Do not check status automatically, we'll check it manually
-    const initializeSessionRes = await this.prepareResumableUpload({
-      ...options,
-
-      path,
-      expectedStatus: null,
-      attributes,
-      size,
-      mimetype
-    })
-    const initStatus = initializeSessionRes.status
-
-    if (videoFilePath && initStatus === HttpStatusCode.CREATED_201) {
-      const locationHeader = initializeSessionRes.header['location']
-      expect(locationHeader).to.not.be.undefined
-
-      const pathUploadId = locationHeader.split('?')[1]
-
-      const result = await this.sendResumableChunks({
-        ...options,
-
-        path,
-        pathUploadId,
-        videoFilePath,
-        size,
-        expectedStatus: completedExpectedStatus
-      })
-
-      if (result.statusCode === HttpStatusCode.OK_200) {
-        await this.endResumableUpload({
-          ...options,
-
-          expectedStatus: HttpStatusCode.NO_CONTENT_204,
-          path,
-          pathUploadId
-        })
-      }
-
-      return result.body?.video || result.body as any
-    }
-
-    const expectedInitStatus = expectedStatus === HttpStatusCode.OK_200
-      ? HttpStatusCode.CREATED_201
-      : expectedStatus
-
-    expect(initStatus).to.equal(expectedInitStatus)
-
-    return initializeSessionRes.body.video || initializeSessionRes.body
-  }
-
-  async prepareResumableUpload (options: OverrideCommandOptions & {
-    path: string
-    attributes: { fixture?: string } & { [id: string]: any }
-    size: number
-    mimetype: string
-
-    originalName?: string
-    lastModified?: number
-  }) {
-    const { path, attributes, originalName, lastModified, size, mimetype } = options
-
-    const attaches = this.buildUploadAttaches(omit(options.attributes, [ 'fixture' ]))
-
-    const uploadOptions = {
-      ...options,
-
-      path,
-      headers: {
-        'X-Upload-Content-Type': mimetype,
-        'X-Upload-Content-Length': size.toString()
-      },
-      fields: {
-        filename: attributes.fixture,
-        originalName,
-        lastModified,
-
-        ...this.buildUploadFields(options.attributes)
-      },
-
-      // Fixture will be sent later
-      attaches: this.buildUploadAttaches(omit(options.attributes, [ 'fixture' ])),
-      implicitToken: true,
-
-      defaultExpectedStatus: null
-    }
-
-    if (Object.keys(attaches).length === 0) return this.postBodyRequest(uploadOptions)
-
-    return this.postUploadRequest(uploadOptions)
-  }
-
-  sendResumableChunks (options: OverrideCommandOptions & {
-    pathUploadId: string
-    path: string
-    videoFilePath: string
-    size: number
-    contentLength?: number
-    contentRangeBuilder?: (start: number, chunk: any) => string
-    digestBuilder?: (chunk: any) => string
-  }) {
-    const {
-      path,
-      pathUploadId,
-      videoFilePath,
-      size,
-      contentLength,
-      contentRangeBuilder,
-      digestBuilder,
-      expectedStatus = HttpStatusCode.OK_200
-    } = options
-
-    let start = 0
-
-    const token = this.buildCommonRequestToken({ ...options, implicitToken: true })
-    const url = this.server.url
-
-    const readable = createReadStream(videoFilePath, { highWaterMark: 8 * 1024 })
-    return new Promise<GotResponse<{ video: VideoCreateResult }>>((resolve, reject) => {
-      readable.on('data', async function onData (chunk) {
-        try {
-          readable.pause()
-
-          const byterangeStart = start + chunk.length - 1
-
-          const headers = {
-            'Authorization': 'Bearer ' + token,
-            'Content-Type': 'application/octet-stream',
-            'Content-Range': contentRangeBuilder
-              ? contentRangeBuilder(start, chunk)
-              : `bytes ${start}-${byterangeStart}/${size}`,
-            'Content-Length': contentLength ? contentLength + '' : chunk.length + ''
-          }
-
-          if (digestBuilder) {
-            Object.assign(headers, { digest: digestBuilder(chunk) })
-          }
-
-          const res = await got<{ video: VideoCreateResult }>({
-            url,
-            method: 'put',
-            headers,
-            path: path + '?' + pathUploadId,
-            body: chunk,
-            responseType: 'json',
-            throwHttpErrors: false
-          })
-
-          start += chunk.length
-
-          // Last request, check final status
-          if (byterangeStart + 1 === size) {
-            if (res.statusCode === expectedStatus) {
-              return resolve(res)
-            }
-
-            if (res.statusCode !== HttpStatusCode.PERMANENT_REDIRECT_308) {
-              readable.off('data', onData)
-
-              // eslint-disable-next-line max-len
-              const message = `Incorrect transient behaviour sending intermediary chunks. Status code is ${res.statusCode} instead of ${expectedStatus}`
-              return reject(new Error(message))
-            }
-          }
-
-          readable.resume()
-        } catch (err) {
-          reject(err)
-        }
-      })
-    })
-  }
-
-  endResumableUpload (options: OverrideCommandOptions & {
-    path: string
-    pathUploadId: string
-  }) {
-    return this.deleteRequest({
-      ...options,
-
-      path: options.path,
-      rawQuery: options.pathUploadId,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  quickUpload (options: OverrideCommandOptions & {
-    name: string
-    nsfw?: boolean
-    privacy?: VideoPrivacy
-    fixture?: string
-    videoPasswords?: string[]
-  }) {
-    const attributes: VideoEdit = { name: options.name }
-    if (options.nsfw) attributes.nsfw = options.nsfw
-    if (options.privacy) attributes.privacy = options.privacy
-    if (options.fixture) attributes.fixture = options.fixture
-    if (options.videoPasswords) attributes.videoPasswords = options.videoPasswords
-
-    return this.upload({ ...options, attributes })
-  }
-
-  async randomUpload (options: OverrideCommandOptions & {
-    wait?: boolean // default true
-    additionalParams?: VideoEdit & { prefixName?: string }
-  } = {}) {
-    const { wait = true, additionalParams } = options
-    const prefixName = additionalParams?.prefixName || ''
-    const name = prefixName + buildUUID()
-
-    const attributes = { name, ...additionalParams }
-
-    const result = await this.upload({ ...options, attributes })
-
-    if (wait) await waitJobs([ this.server ])
-
-    return { ...result, name }
-  }
-
-  // ---------------------------------------------------------------------------
-
-  replaceSourceFile (options: OverrideCommandOptions & {
-    videoId: number | string
-    fixture: string
-    completedExpectedStatus?: HttpStatusCode
-  }) {
-    return this.buildResumeUpload({
-      ...options,
-
-      path: '/api/v1/videos/' + options.videoId + '/source/replace-resumable',
-      attributes: { fixture: options.fixture }
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  removeHLSPlaylist (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/hls'
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  removeHLSFile (options: OverrideCommandOptions & {
-    videoId: number | string
-    fileId: number
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/hls/' + options.fileId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  removeAllWebVideoFiles (options: OverrideCommandOptions & {
-    videoId: number | string
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/web-videos'
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  removeWebVideoFile (options: OverrideCommandOptions & {
-    videoId: number | string
-    fileId: number
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/web-videos/' + options.fileId
-
-    return this.deleteRequest({
-      ...options,
-
-      path,
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  runTranscoding (options: OverrideCommandOptions & VideoTranscodingCreate & {
-    videoId: number | string
-  }) {
-    const path = '/api/v1/videos/' + options.videoId + '/transcoding'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      fields: pick(options, [ 'transcodingType', 'forceTranscoding' ]),
-      implicitToken: true,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  // ---------------------------------------------------------------------------
-
-  private buildListQuery (options: VideosCommonQuery) {
-    return pick(options, [
-      'start',
-      'count',
-      'sort',
-      'nsfw',
-      'isLive',
-      'categoryOneOf',
-      'licenceOneOf',
-      'languageOneOf',
-      'privacyOneOf',
-      'tagsOneOf',
-      'tagsAllOf',
-      'isLocal',
-      'include',
-      'skipCount'
-    ])
-  }
-
-  private buildUploadFields (attributes: VideoEdit) {
-    return omit(attributes, [ 'fixture', 'thumbnailfile', 'previewfile' ])
-  }
-
-  private buildUploadAttaches (attributes: VideoEdit) {
-    const attaches: { [ name: string ]: string } = {}
-
-    for (const key of [ 'thumbnailfile', 'previewfile' ]) {
-      if (attributes[key]) attaches[key] = buildAbsoluteFixturePath(attributes[key])
-    }
-
-    if (attributes.fixture) attaches.videofile = buildAbsoluteFixturePath(attributes.fixture)
-
-    return attaches
-  }
-}
diff --git a/shared/server-commands/videos/views-command.ts b/shared/server-commands/videos/views-command.ts
deleted file mode 100644
index bdb8daaa4..000000000
--- a/shared/server-commands/videos/views-command.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */
-import { HttpStatusCode, VideoViewEvent } from '@shared/models'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
-
-export class ViewsCommand extends AbstractCommand {
-
-  view (options: OverrideCommandOptions & {
-    id: number | string
-    currentTime: number
-    viewEvent?: VideoViewEvent
-    xForwardedFor?: string
-  }) {
-    const { id, xForwardedFor, viewEvent, currentTime } = options
-    const path = '/api/v1/videos/' + id + '/views'
-
-    return this.postBodyRequest({
-      ...options,
-
-      path,
-      xForwardedFor,
-      fields: {
-        currentTime,
-        viewEvent
-      },
-      implicitToken: false,
-      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
-    })
-  }
-
-  async simulateView (options: OverrideCommandOptions & {
-    id: number | string
-    xForwardedFor?: string
-  }) {
-    await this.view({ ...options, currentTime: 0 })
-    await this.view({ ...options, currentTime: 5 })
-  }
-
-  async simulateViewer (options: OverrideCommandOptions & {
-    id: number | string
-    currentTimes: number[]
-    xForwardedFor?: string
-  }) {
-    let viewEvent: VideoViewEvent = 'seek'
-
-    for (const currentTime of options.currentTimes) {
-      await this.view({ ...options, currentTime, viewEvent })
-
-      viewEvent = undefined
-    }
-  }
-}
diff --git a/shared/tsconfig.json b/shared/tsconfig.json
deleted file mode 100644
index 95892077b..000000000
--- a/shared/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "../dist/shared"
-  }
-}
diff --git a/shared/tsconfig.types.json b/shared/tsconfig.types.json
deleted file mode 100644
index 6acfc05e1..000000000
--- a/shared/tsconfig.types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../packages/types/dist/shared",
-    "stripInternal": true,
-    "removeComments": false,
-    "emitDeclarationOnly": true
-  },
-  "exclude": [
-    "server-commands/"
-  ]
-}
diff --git a/shared/typescript-utils/index.ts b/shared/typescript-utils/index.ts
deleted file mode 100644
index c9f6f047d..000000000
--- a/shared/typescript-utils/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './types'
diff --git a/shared/typescript-utils/types.ts b/shared/typescript-utils/types.ts
deleted file mode 100644
index 57cc23f1f..000000000
--- a/shared/typescript-utils/types.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/* eslint-disable @typescript-eslint/array-type */
-
-export type FunctionPropertyNames<T> = {
-  [K in keyof T]: T[K] extends Function ? K : never
-}[keyof T]
-
-export type FunctionProperties<T> = Pick<T, FunctionPropertyNames<T>>
-
-export type AttributesOnly<T> = {
-  [K in keyof T]: T[K] extends Function ? never : T[K]
-}
-
-export type PickWith<T, KT extends keyof T, V> = {
-  [P in KT]: T[P] extends V ? V : never
-}
-
-export type PickWithOpt<T, KT extends keyof T, V> = {
-  [P in KT]?: T[P] extends V ? V : never
-}
-
-// https://github.com/krzkaczor/ts-essentials Rocks!
-export type DeepPartial<T> = {
-  [P in keyof T]?: T[P] extends Array<infer U>
-    ? Array<DeepPartial<U>>
-    : T[P] extends ReadonlyArray<infer U>
-      ? ReadonlyArray<DeepPartial<U>>
-      : DeepPartial<T[P]>
-}
-
-type Primitive = string | Function | number | boolean | symbol | undefined | null
-export type DeepOmitHelper<T, K extends keyof T> = {
-  [P in K]: // extra level of indirection needed to trigger homomorhic behavior
-  T[P] extends infer TP // distribute over unions
-    ? TP extends Primitive
-      ? TP // leave primitives and functions alone
-      : TP extends any[]
-        ? DeepOmitArray<TP, K> // Array special handling
-        : DeepOmit<TP, K>
-    : never
-}
-export type DeepOmit<T, K> = T extends Primitive ? T : DeepOmitHelper<T, Exclude<keyof T, K>>
-
-export type DeepOmitArray<T extends any[], K> = {
-  [P in keyof T]: DeepOmit<T[P], K>
-}