diff --git a/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java
index 05e84da0..4f2bbb23 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java
@@ -21,33 +21,33 @@ import com.dkanada.gramophone.activities.base.AbsBaseActivity;
 
 @SuppressWarnings("FieldCanBeLocal")
 public class AboutActivity extends AbsBaseActivity implements View.OnClickListener {
-    ActivityAboutBinding binding;
+    private ActivityAboutBinding binding;
 
-    CardAboutAppBinding aboutBinding;
-    CardAuthorBinding authorBinding;
-    CardSupportDevelopmentBinding supportBinding;
-    CardSpecialThanksBinding thanksBinding;
+    private CardAboutAppBinding aboutBinding;
+    private CardAuthorBinding authorBinding;
+    private CardSupportDevelopmentBinding supportBinding;
+    private CardSpecialThanksBinding thanksBinding;
 
-    private static String GITHUB = "https://github.com/dkanada/gelli";
+    private final static String GITHUB = "https://github.com/dkanada/gelli";
 
-    private static String TWITTER = "https://twitter.com/karimjabouzeid";
-    private static String WEBSITE = "https://github.com/dkanada";
+    private final static String TWITTER = "https://twitter.com/karimjabouzeid";
+    private final static String WEBSITE = "https://github.com/dkanada";
 
-    private static String TRANSLATE = "https://phonograph.oneskyapp.com/collaboration/project?id=26521";
-    private static String RATE_ON_GOOGLE_PLAY = "https://play.google.com/store/apps/details?id=com.kabouzeid.gramophone";
+    private final static String TRANSLATE = "https://phonograph.oneskyapp.com/collaboration/project?id=26521";
+    private final static String RATE_ON_GOOGLE_PLAY = "https://play.google.com/store/apps/details?id=com.kabouzeid.gramophone";
 
-    private static String AIDAN_FOLLESTAD_GOOGLE_PLUS = "https://google.com/+AidanFollestad";
-    private static String AIDAN_FOLLESTAD_GITHUB = "https://github.com/afollestad";
+    private final static String AIDAN_FOLLESTAD_GOOGLE_PLUS = "https://google.com/+AidanFollestad";
+    private final static String AIDAN_FOLLESTAD_GITHUB = "https://github.com/afollestad";
 
-    private static String MAARTEN_CORPEL_GOOGLE_PLUS = "https://google.com/+MaartenCorpel";
+    private final static String MAARTEN_CORPEL_GOOGLE_PLUS = "https://google.com/+MaartenCorpel";
 
-    private static String ALEKSANDAR_TESIC_GOOGLE_PLUS = "https://google.com/+aleksandartešić";
+    private final static String ALEKSANDAR_TESIC_GOOGLE_PLUS = "https://google.com/+aleksandartešić";
 
-    private static String EUGENE_CHEUNG_GITHUB = "https://github.com/arkon";
-    private static String EUGENE_CHEUNG_WEBSITE = "https://echeung.me/";
+    private final static String EUGENE_CHEUNG_GITHUB = "https://github.com/arkon";
+    private final static String EUGENE_CHEUNG_WEBSITE = "https://echeung.me/";
 
-    private static String ADRIAN_TWITTER = "https://twitter.com/froschgames";
-    private static String ADRIAN_WEBSITE = "https://froschgames.com/";
+    private final static String ADRIAN_TWITTER = "https://twitter.com/froschgames";
+    private final static String ADRIAN_WEBSITE = "https://froschgames.com/";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -91,7 +91,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
         aboutBinding.appSource.setOnClickListener(this);
         authorBinding.visitWebsite.setOnClickListener(this);
         supportBinding.reportBugs.setOnClickListener(this);
-        authorBinding.writeAnEmail.setOnClickListener(this);
         supportBinding.translate.setOnClickListener(this);
         supportBinding.rateOnGooglePlay.setOnClickListener(this);
         supportBinding.donate.setOnClickListener(this);
@@ -135,12 +134,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
             openUrl(WEBSITE);
         } else if (v == supportBinding.reportBugs) {
             openUrl(GITHUB);
-        } else if (v == authorBinding.writeAnEmail) {
-            Intent intent = new Intent(Intent.ACTION_SENDTO);
-            intent.setData(Uri.parse("mailto:contact@kabouzeid.com"));
-            intent.putExtra(Intent.EXTRA_EMAIL, "contact@kabouzeid.com");
-            intent.putExtra(Intent.EXTRA_SUBJECT, "Phonograph");
-            startActivity(Intent.createChooser(intent, "E-Mail"));
         } else if (v == supportBinding.translate) {
             openUrl(TRANSLATE);
         } else if (v == supportBinding.rateOnGooglePlay) {
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
index 7e7cb37a..aab624be 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
@@ -226,7 +226,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
                 colorAppShortcuts.setOnPreferenceChangeListener((preference, newValue) -> {
                     PreferenceUtil.getInstance(getActivity()).setColoredShortcuts((Boolean) newValue);
 
-                    // update app shortcuts
                     new DynamicShortcutManager(getActivity()).updateDynamicShortcuts();
                     return true;
                 });
diff --git a/app/src/main/java/com/dkanada/gramophone/interfaces/MediaCallback.java b/app/src/main/java/com/dkanada/gramophone/interfaces/MediaCallback.java
index 2f0d6b90..f5baebae 100644
--- a/app/src/main/java/com/dkanada/gramophone/interfaces/MediaCallback.java
+++ b/app/src/main/java/com/dkanada/gramophone/interfaces/MediaCallback.java
@@ -4,4 +4,4 @@ import java.util.List;
 
 public interface MediaCallback {
     void onLoadMedia(List<?> media);
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/card_author.xml b/app/src/main/res/layout/card_author.xml
index 6b96b067..e368321c 100644
--- a/app/src/main/res/layout/card_author.xml
+++ b/app/src/main/res/layout/card_author.xml
@@ -70,38 +70,6 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/write_an_email"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/rectSelector"
-            android:clickable="true"
-            android:focusable="true"
-            android:visibility="gone"
-            android:gravity="center_vertical"
-            android:minHeight="@dimen/md_listitem_height"
-            android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
-
-            <com.dkanada.gramophone.views.IconImageView
-                android:id="@+id/icon_email"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_email_white_24dp"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
-                android:text="@string/write_an_email"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-
-        </LinearLayout>
-
         <LinearLayout
             android:id="@+id/follow_on_twitter"
             android:layout_width="match_parent"