Merge branch 'cleanup' into 'master'

Error and unused data cleanup

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

00:07:46

 
  Deploy
passed #243942
docker
deploy_beta

00:02:19