diff --git a/projects/ATV/options b/projects/ATV/options
index 028ab7291f..adac0760e1 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -1,8 +1,5 @@
 # Name of the Distro to build (full name, without special characters)
   DISTRONAME="OpenELEC"
-  if [ "$XBMC" = master ]; then
-    DISTRONAME="OpenELEC_Helix"
-  fi
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -119,9 +116,6 @@
 
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
-  if [ "$XBMC" = master ]; then
-    MEDIACENTER="xbmc-master"
-  fi
 
 # Skins to install (Confluence)
 # Space separated list is supported,
@@ -169,9 +163,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install with LAME cdrip encoder support # deprecated with xbmc-master
-  ENCODER_LAME="yes"
-
 # build and install with BluRay support (yes / no)
   BLURAY_SUPPORT="yes"
 
diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options
index 9d4efe4730..ff0cbc6e81 100644
--- a/projects/Cuboxi/options
+++ b/projects/Cuboxi/options
@@ -1,5 +1,5 @@
 # Name of the Distro to build (full name, without special characters)
-  DISTRONAME="OpenELEC_Helix"
+  DISTRONAME="OpenELEC"
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -115,7 +115,7 @@
   SQUASHFS_COMPRESSION="gzip"
 
 # Mediacenter to use (xbmc / no)
-  MEDIACENTER="xbmc-master"
+  MEDIACENTER="xbmc"
 
 # Skins to install (Confluence)
 # Space separated list is supported,
@@ -164,9 +164,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install with LAME cdrip encoder support # deprecated with xbmc-master
-  ENCODER_LAME="yes"
-
 # build and install with BluRay support (yes / no)
   BLURAY_SUPPORT="yes"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index 8849924104..42624edea9 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -1,8 +1,5 @@
 # Name of the Distro to build (full name, without special characters)
   DISTRONAME="OpenELEC"
-  if [ "$XBMC" = master ]; then
-    DISTRONAME="OpenELEC_Helix"
-  fi
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -119,9 +116,6 @@
 
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
-  if [ "$XBMC" = master ]; then
-    MEDIACENTER="xbmc-master"
-  fi
 
 # Skins to install (Confluence)
 # Space separated list is supported,
@@ -169,9 +163,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install with LAME cdrip encoder support # deprecated with xbmc-master
-  ENCODER_LAME="yes"
-
 # build and install with BluRay support (yes / no)
   BLURAY_SUPPORT="yes"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index 14b0c62c1b..99fdcc19bf 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -1,8 +1,5 @@
 # Name of the Distro to build (full name, without special characters)
   DISTRONAME="OpenELEC"
-  if [ "$XBMC" = master ]; then
-    DISTRONAME="OpenELEC_Helix"
-  fi
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -119,9 +116,6 @@
 
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
-  if [ "$XBMC" = master ]; then
-    MEDIACENTER="xbmc-master"
-  fi
 
 # Skins to install (Confluence)
 # Space separated list is supported,
@@ -170,9 +164,6 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install with LAME cdrip encoder support # deprecated with xbmc-master
-  ENCODER_LAME="yes"
-
 # build and install with BluRay support (yes / no)
   BLURAY_SUPPORT="yes"