diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
index 0e3065e..4486399 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
@@ -104,7 +104,7 @@
                     @Override
                     public void onResponse(String response) {
                         Map<String, Player> player = JSON.decode(response, new TypeReference<HashMap<String, Player>>(){});
-                        // TODO: 複数帰ってきた，もしくは帰ってこなかったときの処理
+                       //複数帰ってきた，もしくは帰ってこなかったときの処理
 
                         // プレイ画面へ
                         Bundle bundle = new Bundle();
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 40446a1..1a1a57d 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -5,10 +5,9 @@
     android:layout_height="match_parent"
     tools:context=".cactusClient.views.PlayerFragment">
 
-    <!-- TODO: Update blank fragment layout -->
     <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:text="@string/hello_blank_fragment" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_real_time.xml b/app/src/main/res/layout/fragment_real_time.xml
index 899bc36..d348419 100644
--- a/app/src/main/res/layout/fragment_real_time.xml
+++ b/app/src/main/res/layout/fragment_real_time.xml
@@ -5,11 +5,10 @@
     android:layout_height="match_parent"
     tools:context=".framework.gameMain.RealTimeFragment">
 
-    <!-- TODO: Update blank fragment layout -->
     <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:text="RealTime"
         android:textSize="24sp" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_real_time_3d.xml b/app/src/main/res/layout/fragment_real_time_3d.xml
index 99fb49b..14147fb 100644
--- a/app/src/main/res/layout/fragment_real_time_3d.xml
+++ b/app/src/main/res/layout/fragment_real_time_3d.xml
@@ -5,8 +5,6 @@
     android:layout_height="match_parent"
     tools:context=".framework.gameMain.RealTime3DFragment">
 
-    <!-- TODO: Update blank fragment layout -->
-
     <FrameLayout
         android:id="@+id/game_layout"
         android:layout_width="match_parent"
@@ -21,4 +19,4 @@
 
     </FrameLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_sample_game2.xml b/app/src/main/res/layout/fragment_sample_game2.xml
index f1649e6..d0441f9 100644
--- a/app/src/main/res/layout/fragment_sample_game2.xml
+++ b/app/src/main/res/layout/fragment_sample_game2.xml
@@ -6,10 +6,9 @@
     android:layout_height="match_parent"
     tools:context=".cactusClient.tests.SampleGame2Fragment">
 
-    <!-- TODO: Update blank fragment layout -->
     <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:text="@string/hello_blank_fragment" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml
index c4aa179..c8ed3f4 100644
--- a/app/src/main/res/layout/fragment_start.xml
+++ b/app/src/main/res/layout/fragment_start.xml
@@ -7,8 +7,6 @@
     android:layout_height="match_parent"
     tools:context=".cactusClient.views.StartFragment">
 
-    <!-- TODO: Update blank fragment layout -->
-
     <Button
         android:id="@+id/start_button"
         android:layout_width="150dp"
@@ -36,4 +34,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 447e61c..c420169 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,5 @@
 <resources>
     <string name="app_name">Cactus</string>
     <string name="action_settings">Settings</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>