Drastically simplify and tidy project part 2