removing TODO comments