Import cleanups

Closed Philipp Arras requested to merge import_cleanups into NIFTy_4

Merge request reports