Merge branch 'cleanup2' into 'NIFTy_4'

Cleanup2

See merge request ift/NIFTy!233
3 jobs for NIFTy_4 in 5 minutes and 28 seconds (queued for 1 second)