roadmap a bit of cleanup