diff --git a/scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg b/scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg
index 64f5c48c04cd7febdaa8c31cf99d2d8a8a1bb69a..c502c781ec39ec0600a1cb99a0e74729a32410bb 100644
--- a/scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg
+++ b/scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg
@@ -2,235 +2,13 @@
# HokuyoLaserUnitApp properties
# ==================================================================
-# ArmarX.AdditionalPackages: List of additional ArmarX packages which should be in the list of default packages. If you have custom packages, which should be found by the gui or other apps, specify them here. Comma separated List.
+# ArmarX.HokuyoLaserUnit.AngleOffset:
# Attributes:
-# - Default: Default value not mapped.
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.AdditionalPackages = Default value not mapped.
-
-
-# ArmarX.ApplicationName: Application name
-# Attributes:
-# - Default: ""
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.ApplicationName = ""
-
-
-# ArmarX.CachePath: Path for cache files. If relative path AND env. variable ARMARX_USER_CONFIG_DIR is set, the cache path will be made relative to ARMARX_USER_CONFIG_DIR. Otherwise if relative it will be relative to the default ArmarX config dir (${HOME}/.armarx)
-# Attributes:
-# - Default: mongo/.cache
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.CachePath = mongo/.cache
-
-
-# ArmarX.Config: Comma-separated list of configuration files
-# Attributes:
-# - Default: ""
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.Config = ""
-
-
-# ArmarX.DataPath: Semicolon-separated search list for data files
-# Attributes:
-# - Default: ""
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.DataPath = ""
-
-
-# ArmarX.DefaultPackages: List of ArmarX packages which are accessible by default. Comma separated List. If you want to add your own packages and use all default ArmarX packages, use the property 'AdditionalPackages'.
-# Attributes:
-# - Default: Default value not mapped.
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.DefaultPackages = Default value not mapped.
-
-
-# ArmarX.DependenciesConfig: Path to the (usually generated) config file containing all data paths of all dependent projects. This property usually does not need to be edited.
-# Attributes:
-# - Default: ./config/dependencies.cfg
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.DependenciesConfig = ./config/dependencies.cfg
-
-
-# ArmarX.DisableLogging: Turn logging off in whole application
-# Attributes:
-# - Default: false
-# - Case sensitivity: yes
-# - Required: no
-# - Possible values: {0, 1, false, no, true, yes}
-# ArmarX.DisableLogging = false
-
-
-# ArmarX.EnableProfiling: Enable profiling of CPU load produced by this application
-# Attributes:
-# - Default: false
-# - Case sensitivity: yes
-# - Required: no
-# - Possible values: {0, 1, false, no, true, yes}
-# ArmarX.EnableProfiling = false
-
-
-# ArmarX.HokuyoLaserUnit.AngleOffset: Offset is applied the raw angles before reporting them
-# Attributes:
-# - Default: -2.3561945
-# - Case sensitivity: yes
-# - Required: no
ArmarX.HokuyoLaserUnit.AngleOffset = 0
-# ArmarX.HokuyoLaserUnit.DebugObserverName: Name of the topic the DebugObserver listens on
-# Attributes:
-# - Default: DebugObserver
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.HokuyoLaserUnit.DebugObserverName = DebugObserver
-
-
-# ArmarX.HokuyoLaserUnit.Devices: List of devices in form of 'IP1,port1,frame1;IP2,port2,frame2;...'
+# ArmarX.HokuyoLaserUnit.Devices:
# Attributes:
-# - Default: ""
-# - Case sensitivity: yes
-# - Required: no
ArmarX.HokuyoLaserUnit.Devices = "192.168.0.11,10940,Laser Scanner A"
-# ArmarX.HokuyoLaserUnit.EnableProfiling: enable profiler which is used for logging performance events
-# Attributes:
-# - Default: false
-# - Case sensitivity: yes
-# - Required: no
-# - Possible values: {0, 1, false, no, true, yes}
-# ArmarX.HokuyoLaserUnit.EnableProfiling = false
-
-
-# ArmarX.HokuyoLaserUnit.LaserScannerTopicName: Name of the laser scan topic.
-# Attributes:
-# - Default: LaserScans
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.HokuyoLaserUnit.LaserScannerTopicName = LaserScans
-
-
-# ArmarX.HokuyoLaserUnit.MinimumLoggingLevel: Local logging level only for this component
-# Attributes:
-# - Default: Undefined
-# - Case sensitivity: yes
-# - Required: no
-# - Possible values: {Debug, Error, Fatal, Important, Info, Undefined, Verbose, Warning}
-# ArmarX.HokuyoLaserUnit.MinimumLoggingLevel = Undefined
-
-
-# ArmarX.HokuyoLaserUnit.ObjectName: Name of IceGrid well-known object
-# Attributes:
-# - Default: ""
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.HokuyoLaserUnit.ObjectName = ""
-
-
-# ArmarX.HokuyoLaserUnit.RobotHealthTopicName: Name of the RobotHealth topic
-# Attributes:
-# - Default: RobotHealthTopic
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.HokuyoLaserUnit.RobotHealthTopicName = RobotHealthTopic
-
-
-# ArmarX.HokuyoLaserUnit.UpdatePeriod: Update period for laser scans
-# Attributes:
-# - Default: 25
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.HokuyoLaserUnit.UpdatePeriod = 25
-
-
-# ArmarX.LoadLibraries: Libraries to load at start up of the application. Must be enabled by the Application with enableLibLoading(). Format: PackageName:LibraryName;... or /absolute/path/to/library;...
-# Attributes:
-# - Default: ""
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.LoadLibraries = ""
-
-
-# ArmarX.LoggingGroup: The logging group is transmitted with every ArmarX log message over Ice in order to group the message in the GUI.
-# Attributes:
-# - Default: ""
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.LoggingGroup = ""
-
-
-# ArmarX.RedirectStdout: Redirect std::cout and std::cerr to ArmarXLog
-# Attributes:
-# - Default: true
-# - Case sensitivity: yes
-# - Required: no
-# - Possible values: {0, 1, false, no, true, yes}
-# ArmarX.RedirectStdout = true
-
-
-# ArmarX.RemoteHandlesDeletionTimeout: The timeout (in ms) before a remote handle deletes the managed object after the use count reached 0. This time can be used by a client to increment the count again (may be required when transmitting remote handles)
-# Attributes:
-# - Default: 3000
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.RemoteHandlesDeletionTimeout = 3000
-
-
-# ArmarX.SecondsStartupDelay: The startup will be delayed by this number of seconds (useful for debugging)
-# Attributes:
-# - Default: 0
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.SecondsStartupDelay = 0
-
-
-# ArmarX.StartDebuggerOnCrash: If this application crashes (segmentation fault) qtcreator will attach to this process and start the debugger.
-# Attributes:
-# - Default: false
-# - Case sensitivity: yes
-# - Required: no
-# - Possible values: {0, 1, false, no, true, yes}
-# ArmarX.StartDebuggerOnCrash = false
-
-
-# ArmarX.ThreadPoolSize: Size of the ArmarX ThreadPool that is always running.
-# Attributes:
-# - Default: 1
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.ThreadPoolSize = 1
-
-
-# ArmarX.TopicSuffix: Suffix appended to all topic names for outgoing topics. This is mainly used to direct all topics to another name for TopicReplaying purposes.
-# Attributes:
-# - Default: ""
-# - Case sensitivity: yes
-# - Required: no
-# ArmarX.TopicSuffix = ""
-
-
-# ArmarX.UseTimeServer: Enable using a global Timeserver (e.g. from ArmarXSimulator)
-# Attributes:
-# - Default: false
-# - Case sensitivity: yes
-# - Required: no
-# - Possible values: {0, 1, false, no, true, yes}
-# ArmarX.UseTimeServer = false
-
-
-# ArmarX.Verbosity: Global logging level for whole application
-# Attributes:
-# - Default: Info
-# - Case sensitivity: yes
-# - Required: no
-# - Possible values: {Debug, Error, Fatal, Important, Info, Undefined, Verbose, Warning}
-# ArmarX.Verbosity = Info
-
-
diff --git a/scenarios/LaserScannerTest/config/LaserScannerUnitObserverApp.cfg b/scenarios/LaserScannerTest/config/LaserScannerUnitObserverApp.cfg
index 18521b1447699a031af7d198c2de4138876681b0..04e3f5637379f9dfdaec5521d008164bbeb804d9 100644
--- a/scenarios/LaserScannerTest/config/LaserScannerUnitObserverApp.cfg
+++ b/scenarios/LaserScannerTest/config/LaserScannerUnitObserverApp.cfg
@@ -18,7 +18,7 @@
# ArmarX.ApplicationName = ""
-# ArmarX.CachePath: Path for cache files. If relative path AND env. variable ARMARX_USER_CONFIG_DIR is set, the cache path will be made relative to ARMARX_USER_CONFIG_DIR. Otherwise if relative it will be relative to the default ArmarX config dir (${HOME}/.armarx)
+# ArmarX.CachePath: Path for cache files. If relative path AND env. variable ARMARX_CONFIG_DIR is set, the cache path will be made relative to ARMARX_CONFIG_DIR. Otherwise if relative it will be relative to the default ArmarX config dir (${ARMARX_WORKSPACE}/armarx_config)
# Attributes:
# - Default: mongo/.cache
# - Case sensitivity: yes