diff --git a/omniNotes/src/main/AndroidManifest.xml b/omniNotes/src/main/AndroidManifest.xml
index 4978fc0c30..ae82085735 100644
--- a/omniNotes/src/main/AndroidManifest.xml
+++ b/omniNotes/src/main/AndroidManifest.xml
@@ -279,10 +279,6 @@
             <meta-data
                 android:name="description"
                 android:value="@string/dashclock_description" />
-            <!-- A settings activity is optional -->
-            <!-- <meta-data -->
-            <!-- android:name="settingsActivity" -->
-            <!-- android:value=".ExampleSettingsActivity" /> -->
         </service>
 
         <service
diff --git a/omniNotes/src/main/res/animator/slide_back_left.xml b/omniNotes/src/main/res/animator/slide_back_left.xml
index d274eaaf36..130895c3a7 100644
--- a/omniNotes/src/main/res/animator/slide_back_left.xml
+++ b/omniNotes/src/main/res/animator/slide_back_left.xml
@@ -25,16 +25,6 @@
         android:toXDelta="-70%"
         android:toYDelta="0" />
 
-<!--     <scale -->
-<!--         android:duration="@android:integer/config_shortAnimTime" -->
-<!--         android:fromXScale="1" -->
-<!--         android:fromYScale="1" -->
-<!--         android:pivotX="50%" -->
-<!--         android:pivotY="50%" -->
-<!--         android:toXScale="0.2" -->
-<!--         android:toYScale="0.2" > -->
-<!--     </scale> -->
-    
     <alpha
         android:duration="@integer/sliding_anim_time_medium"
         android:fromAlpha="1.0"
diff --git a/omniNotes/src/main/res/animator/slide_back_right.xml b/omniNotes/src/main/res/animator/slide_back_right.xml
index 3584874a8b..88f4637776 100644
--- a/omniNotes/src/main/res/animator/slide_back_right.xml
+++ b/omniNotes/src/main/res/animator/slide_back_right.xml
@@ -25,17 +25,6 @@
         android:toXDelta="0"
         android:toYDelta="0" />
 
-
-<!--     <scale -->
-<!--         android:duration="@android:integer/config_shortAnimTime" -->
-<!--         android:fromXScale="0.2" -->
-<!--         android:fromYScale="0.2" -->
-<!--         android:pivotX="50%" -->
-<!--         android:pivotY="50%" -->
-<!--         android:toXScale="1" -->
-<!--         android:toYScale="1" > -->
-<!--     </scale> -->
-    
     <alpha
         android:duration="@integer/sliding_anim_time_short"
         android:fromAlpha="0.0"
diff --git a/omniNotes/src/main/res/animator/slide_left.xml b/omniNotes/src/main/res/animator/slide_left.xml
index 035bdf03e5..88fd2362c0 100644
--- a/omniNotes/src/main/res/animator/slide_left.xml
+++ b/omniNotes/src/main/res/animator/slide_left.xml
@@ -25,16 +25,6 @@
         android:toXDelta="0"
         android:toYDelta="0" />
     
-
-<!--     <scale -->
-<!--         android:duration="@android:integer/config_shortAnimTime" -->
-<!--         android:fromXScale="0.2" -->
-<!--         android:fromYScale="0.2" -->
-<!--         android:pivotX="50%" -->
-<!--         android:pivotY="50%" -->
-<!--         android:toXScale="1" -->
-<!--         android:toYScale="1" > -->
-<!--     </scale> -->
     <alpha
         android:duration="@integer/sliding_anim_time_short"
         android:fromAlpha="0.0"
diff --git a/omniNotes/src/main/res/animator/slide_right.xml b/omniNotes/src/main/res/animator/slide_right.xml
index 0dd813056b..b2276a6912 100644
--- a/omniNotes/src/main/res/animator/slide_right.xml
+++ b/omniNotes/src/main/res/animator/slide_right.xml
@@ -24,17 +24,6 @@
         android:toXDelta="100%"
         android:toYDelta="0" />
 
-
-<!--     <scale -->
-<!--         android:duration="@android:integer/config_shortAnimTime" -->
-<!--         android:fromXScale="1" -->
-<!--         android:fromYScale="1" -->
-<!--         android:pivotX="50%" -->
-<!--         android:pivotY="50%" -->
-<!--         android:toXScale="0.2" -->
-<!--         android:toYScale="0.2" > -->
-<!--     </scale> -->
-    
     <alpha
         android:duration="@integer/sliding_anim_time_medium"
         android:fromAlpha="1.0"
diff --git a/omniNotes/src/main/res/drawable/image_borders.xml b/omniNotes/src/main/res/drawable/image_borders.xml
index ca83ebae7c..278e765c47 100644
--- a/omniNotes/src/main/res/drawable/image_borders.xml
+++ b/omniNotes/src/main/res/drawable/image_borders.xml
@@ -24,7 +24,6 @@
 </item>
 <item android:top="4dp">
     <shape android:shape="rectangle">
-<!--         <solid android:color="@color/gray_bg" /> -->
         <solid android:color="@color/white" />
     </shape>
 </item>
diff --git a/omniNotes/src/main/res/drawable/list_selector_focused.xml b/omniNotes/src/main/res/drawable/list_selector_focused.xml
index 6b51504dbc..e698de0907 100644
--- a/omniNotes/src/main/res/drawable/list_selector_focused.xml
+++ b/omniNotes/src/main/res/drawable/list_selector_focused.xml
@@ -23,12 +23,5 @@
     <solid
         android:color="@color/kitkat_gray_light" >
     </solid>
- 
-    <!-- view border color and width -->
-    <!--<stroke-->
-        <!--android:width="2dp"-->
-        <!--android:color="#ffffff" >-->
-    <!--</stroke>-->
->
- 
+
 </shape>
diff --git a/omniNotes/src/main/res/drawable/list_selector_pressed.xml b/omniNotes/src/main/res/drawable/list_selector_pressed.xml
index cc550da1f1..e698de0907 100644
--- a/omniNotes/src/main/res/drawable/list_selector_pressed.xml
+++ b/omniNotes/src/main/res/drawable/list_selector_pressed.xml
@@ -23,12 +23,5 @@
     <solid
         android:color="@color/kitkat_gray_light" >
     </solid>
- 
-    <!-- view border color and width -->
-    <!--<stroke-->
-        <!--android:width="2dp"-->
-        <!--android:color="@color/kitkat_gray_light" >-->
-    <!--</stroke>-->
->
- 
+
 </shape>
diff --git a/omniNotes/src/main/res/drawable/scroll_bar.xml b/omniNotes/src/main/res/drawable/scroll_bar.xml
index 8a3189c025..60c5441723 100644
--- a/omniNotes/src/main/res/drawable/scroll_bar.xml
+++ b/omniNotes/src/main/res/drawable/scroll_bar.xml
@@ -19,16 +19,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <solid android:color="@color/selected"/>
-<!--     <gradient -->
-<!--         android:angle="45" -->
-<!--         android:endColor="@color/gray_bg" -->
-<!--         android:centerColor="@color/selected" -->
-<!--         android:startColor="@color/gray_bg" /> -->
-
-<!--     <corners android:radius="8dp" /> -->
-
-<!--     <padding -->
-<!--         android:left="0.5dp" -->
-<!--         android:right="0.5dp" /> -->
 
 </shape>
diff --git a/omniNotes/src/main/res/layout/drawer_category_list_footer.xml b/omniNotes/src/main/res/layout/drawer_category_list_footer.xml
index 888918e254..f7a39921b4 100644
--- a/omniNotes/src/main/res/layout/drawer_category_list_footer.xml
+++ b/omniNotes/src/main/res/layout/drawer_category_list_footer.xml
@@ -14,15 +14,6 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<!-- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" -->
-<!--     xmlns:pixlui="http://schemas.android.com/apk/com.neopixl.pixlui" -->
-<!--     android:layout_width="match_parent" -->
-<!--     android:layout_height="wrap_content" -->
-<!--     android:background="@drawable/icon_selector" -->
-<!--     android:gravity="center_vertical" -->
-<!--     android:orientation="horizontal" -->
-<!--     android:paddingLeft="@dimen/horizontal_margin" -->
-<!--     android:paddingStart="@dimen/horizontal_margin"> -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:pixlui="http://schemas.android.com/apk/com.neopixl.pixlui"
     android:layout_width="match_parent"
@@ -30,7 +21,6 @@
     android:background="@drawable/icon_selector"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingLeft="@dimen/horizontal_margin"
     android:paddingStart="@dimen/horizontal_margin">
 
     <ImageView
@@ -39,25 +29,11 @@
         android:padding="4dp"
         android:src="@drawable/ic_settings_black_36dp" />
 
-<!--     <com.neopixl.pixlui.components.textview.TextView -->
-<!--         android:id="@+id/settings" -->
-<!--         android:layout_width="@dimen/navigation_drawer_width" -->
-<!--         android:layout_height="50dp" -->
-<!--         android:gravity="center_vertical" -->
-<!--         android:paddingLeft="@dimen/icon_text_margin" -->
-<!--         android:paddingStart="@dimen/icon_text_margin" -->
-<!--         android:text="@string/settings" -->
-<!--         android:textAllCaps="true" -->
-<!--         android:textAppearance="@style/Text.Normal" -->
-<!--         android:textColor="@color/drawer_text" -->
-<!--         pixlui:typeface="Roboto-Regular.ttf" /> -->
-
     <com.neopixl.pixlui.components.textview.TextView
         android:id="@+id/settings"
         android:layout_width="@dimen/navigation_drawer_width"
         android:layout_height="50dp"
         android:gravity="center_vertical"
-        android:paddingLeft="@dimen/icon_text_margin"
         android:paddingStart="@dimen/icon_text_margin"
         android:text="@string/settings"
         android:textAllCaps="true"
diff --git a/omniNotes/src/main/res/layout/fragment_navigation_drawer.xml b/omniNotes/src/main/res/layout/fragment_navigation_drawer.xml
index 1f0981657e..fd41228924 100644
--- a/omniNotes/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/omniNotes/src/main/res/layout/fragment_navigation_drawer.xml
@@ -28,13 +28,6 @@
         android:layout_gravity="start"
         android:orientation="vertical">
 
-        <!--<ImageView-->
-            <!--android:id="@+id/navdrawer_image"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="?attr/actionBarSize"-->
-            <!--android:src="@drawable/material_wall"-->
-            <!--android:scaleType="centerCrop" />-->
-
         <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/navigation_drawer_image_height">