Merge branch 'cleanup' into 'master'

Error and unused data cleanup

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

00:07:34

 
  Deploy
passed #243617
docker
deploy_beta

00:02:23