Merge branch 'cleanup' into 'master'

Error and unused data cleanup

See merge request !17
2 jobs for master in 11 minutes and 53 seconds (queued for 5 seconds)
latest
Status Job ID Name Coverage
  Build
passed #242991
docker
build

00:08:14

 
  Deploy
passed #242992
docker
deploy_beta

00:03:38