Merge branch 'cleanup' into 'master'

Error and unused data cleanup

See merge request !17
2 jobs for master in 10 minutes and 26 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Build
passed #244148
docker
build

00:07:40

 
  Deploy
passed #244149
docker
deploy_beta

00:02:45