Removing TODO comments after creating corresponding issues on GitHub, round#1