cleanup, reduce roadmap