Merge branch 'cleanup' into 'master'

various cleanups

See merge request !158
5 jobs for master in 12 minutes and 54 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #200458
test_min

00:03:32

passed #200459
test_mpi

00:05:16

passed #200460
test_mpi_fftw

00:05:32

passed #200461
test_mpi_fftw_hdf5

00:06:26

63.0%
 
  Release
passed #200462
release_image_master

00:05:50