Import cleanups

3 jobs for NIFTy_5 in 1 minute and 25 seconds (queued for 2 seconds)