Cleanup manifest and roadmap