diff --git a/firefox.spec b/firefox.spec
index fa0dbe4..f57719b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -547,11 +547,9 @@ DESTDIR=$RPM_BUILD_ROOT make -C objdir install
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
-%if 0%{?fedora} <= 16
-desktop-file-install --vendor mozilla --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20}
-%else
+
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20}
-%endif
+
 
 # set up the firefox start script
 %{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
@@ -618,15 +616,8 @@ create_default_langpack "sv-SE" "sv"
 create_default_langpack "zh-TW" "zh"
 %endif # build_langpacks
 
-# Keep compatibility with the old preference location 
-# on Fedora 18 and earlier
-%if 0%{?fedora} < 19
-%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences
-%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/browser/defaults
-ln -s %{mozappdir}/defaults/preferences $RPM_BUILD_ROOT/%{mozappdir}/browser/defaults/preferences
-%else
+
 %{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/browser/defaults/preferences
-%endif
 
 # System extensions
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id}
@@ -662,8 +653,7 @@ rm -f ${RPM_BUILD_ROOT}%{mozappdirdev}/sdk/lib/libmozalloc.so
 rm -f ${RPM_BUILD_ROOT}%{mozappdirdev}/sdk/lib/libxul.so
 #---------------------------------------------------------------------
 
-# Moves defaults/preferences to browser/defaults/preferences in Fedora 19+
-%if 0%{?fedora} >= 19
+# Moves defaults/preferences to browser/defaults/preferences
 %pretrans -p <lua>
 require 'posix'
 require 'os'
@@ -681,7 +671,7 @@ if (posix.stat("%{mozappdir}/browser/defaults/preferences", "type") == "link") t
     end
   end
 end
-%endif
+
 
 %preun
 # is it a final removal?
@@ -777,6 +767,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Update to 35.0 Build 3
 - Gtk3 - added fix for button/entry box sizes
 - Gtk3 - added fix for button/entry focus sizes
+- Spec clean-up (by moez.roy@gmail.com)
 
 * Tue Jan 6 2015 Martin Stransky <stransky@redhat.com> - 35.0-1
 - Update to 35.0 Build 1