diff --git a/sugar/env.py b/sugar/env.py
index 4b977d37..6f654f36 100644
--- a/sugar/env.py
+++ b/sugar/env.py
@@ -35,14 +35,14 @@ def setup():
 	if sugar_source_dir:
 		source = os.path.join(sugar_source_dir, 'activities')
 		runner = os.path.join(sugar_source_dir, 'shell/sugar-activity-factory')
-		sugar.setup.setup_activities(source, get_activities_dir(), runner)
+		sugar.setup.setup_activities(source, sugar_activities_dir, runner)
 		
 		bin = os.path.join(sugar_source_dir, 'shell/sugar-presence-service')
 		sugar.setup.write_service('org.laptop.Presence', bin,
-								  get_services_dir())
+								  sugar_activities_dir)
 
 	registry = sugar.conf.get_activity_registry()
-	registry.scan_directory(get_activities_dir())
+	registry.scan_directory(sugar_activities_dir)
 
 	read_profile()
 
@@ -69,12 +69,3 @@ def get_data_dir():
 
 def get_dbus_config():
 	return sugar_dbus_config
-
-def get_data_file(filename):
-	return os.path.join(get_data_dir(), filename)
-		
-def get_activities_dir():
-	return sugar_activities_dir
-
-def get_services_dir():
-	return sugar_activities_dir