Merge branch 'cleanup' into 'master'

Error and unused data cleanup

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

00:08:42

 
  Deploy
passed #243436
docker
deploy_beta

00:02:27