Cleanup todo, shift referenced issue numbers