Tidying up some old solar projects Part 2