diff --git a/src/forecaster/Dockerfile b/src/forecaster/Dockerfile
index a0d4cd5613a44f663c9f329e3bc4b51e3550e594..4e0c4fe0192be87d5843bdfe0c33ce498bca79e6 100644
--- a/src/forecaster/Dockerfile
+++ b/src/forecaster/Dockerfile
@@ -63,6 +63,7 @@ RUN python3 -m pip install -r requirements.txt
 # Add component files into working directory
 WORKDIR /var/teraflow
 COPY src/context/. context/
+COPY src/device/. device/
 COPY src/forecaster/. forecaster/
 COPY src/monitoring/. monitoring/
 
diff --git a/src/forecaster/service/TODO.txt b/src/forecaster/service/TODO.txt
index e5fabe3fe4a233adb35222c0e3b9d4a1376b15b7..621a316542442f140b43bad373102f083585cc28 100644
--- a/src/forecaster/service/TODO.txt
+++ b/src/forecaster/service/TODO.txt
@@ -1,21 +1,4 @@
 
-Use a smaller network:
-INFO     forecaster.tests.Tools:Tools.py:75 Discovering Devices and Links...
-INFO     forecaster.tests.Tools:Tools.py:104   Found 22 devices and 462 links...
-
-In topology forecaster, the data file should contain more than 1 row per link, otherwise, it crashes with no enough samples.
-
-- implement integration with pathcomputation
-
-
-test case:
-- instantiate Context and Monitoring
-- populate topology
-- populate monitoring timeseries with link utilizations
-- run test for link
-- run test for topology
-
-
 ## PathComp Impact
 After retrieving the topology, if the service has a duration constraint configured, the PathComp component should interrogate the Forecaster and request a topology forecast according to the requested duration of the service. The computed link capacity forecast should be used as link capacity in path computations.