Removing unused code, adding roadmap