diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index c83257f0..fe241f34 100644
--- a/src/sugar/bundle/activitybundle.py
+++ b/src/sugar/bundle/activitybundle.py
@@ -71,7 +71,7 @@ class ActivityBundle(Bundle):
             self._parse_linfo(linfo_file)
 
         if self._local_name == None:
-           self._local_name = self._name
+            self._local_name = self._name
 
     def _get_manifest(self):
         if self._manifest is None:
@@ -149,9 +149,6 @@ class ActivityBundle(Bundle):
 
         if cp.has_option(section, 'bundle_id'):
             self._bundle_id = cp.get(section, 'bundle_id')
-        # FIXME deprecated
-        elif cp.has_option(section, 'service_name'):
-            self._bundle_id = cp.get(section, 'service_name')
         else:
             raise MalformedBundleException(
                 'Activity bundle %s does not specify a bundle id' %
@@ -163,10 +160,7 @@ class ActivityBundle(Bundle):
             raise MalformedBundleException(
                 'Activity bundle %s does not specify a name' % self._path)
 
-        # FIXME class is deprecated
-        if cp.has_option(section, 'class'):
-            self.activity_class = cp.get(section, 'class')
-        elif cp.has_option(section, 'exec'):
+        if cp.has_option(section, 'exec'):
             self.bundle_exec = cp.get(section, 'exec')
         else:
             raise MalformedBundleException(