Merge branch 'cleanup' into 'master'

Error and unused data cleanup

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

00:07:20

 
  Deploy
passed #242665
docker
deploy_beta

00:03:12