diff --git a/tangostationcontrol/setup.cfg b/tangostationcontrol/setup.cfg
index bdb3dbae7df1071b616c769342155349fde7ca65..127f89141b4fc26fd283816923d9b1708bfa8a26 100644
--- a/tangostationcontrol/setup.cfg
+++ b/tangostationcontrol/setup.cfg
@@ -57,13 +57,11 @@ console_scripts =
     l2ss-temperature-manager = tangostationcontrol.devices.temperature_manager:main
 
 # The following entry points should eventually be removed / replaced
-    l2ss-cold-start = tangostationcontrol.toolkit.lts_cold_start:main
     l2ss-hardware-device-template = tangostationcontrol.examples.HW_device_template:main
     l2ss-ini-device = tangostationcontrol.examples.load_from_disk.ini_device:main
-    l2ss-parse-sdp-packet = tangostationcontrol.devices.sdp.packet:main
+    l2ss-parse-statistics-packet = tangostationcontrol.statistics.packet:main
     l2ss-random-data = tangostationcontrol.test.devices.random_data:main
-    l2ss-snmp = tangostationcontrol.examples.snmp.snmp:main
-    l2ss-version = tangostationcontrol.common.lofar_version:main
+    l2ss-version = tangostationcontrol:print_version
 
 [options.package_data]
 * = *.json, *.mib
diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini
index 9bd8b804bcfabb04d4caf630c926fdcbe30ef1f9..1431b618acbd0dcb0b3dfbdb412bf874c811ac2d 100644
--- a/tangostationcontrol/tox.ini
+++ b/tangostationcontrol/tox.ini
@@ -36,7 +36,7 @@ setenv =
     TESTS_DIR=./tangostationcontrol/integration_test/{env:TEST_MODULE:default}
     PYTHON={envpython} -m coverage run --source tangostationcontrol --parallel-mode
 commands =
-    echo "Integration test directory configured for{env:TESTS_DIR} ({env:TEST_MODULE})"
+    echo "Integration test directory configured for{env:TESTS_DIR} ({env:TEST_MODULE:default})"
     {envpython} -m stestr run --serial {posargs}
     {envpython} -m coverage combine
     {envpython} -m coverage html --omit='*test*' -d cover