Merge branch 'cleanup' into 'master'

Error and unused data cleanup

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

00:07:21

 
  Deploy
passed #243087
docker
deploy_beta

00:02:21