Organize the dependencies and some clean-up

4 jobs for conda in 31 minutes and 47 seconds (queued for 42 minutes and 58 seconds)