Merge branch 'cleanup' into 'master'

Error and unused data cleanup

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

00:08:26

 
  Deploy
passed #244073
docker
deploy_beta

00:02:23