diff --git a/README.md b/README.md
index e15c7981a86534c4b58bb289904535a658e2d66f..b2a40b34bd703c1466f93f370e7aabcddcc9d34e 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,30 @@ The API documentation is available at `<BASE URL>/swagger-ui.html`. A JSON versi
 
 ## TODO
 
+* Fix bugs;
 * Externalize configuration (DB parameters, security enabled/disabled, ...);
-* Sync backend with hand written Swagger specs (see Maintenance section below);
+* Decide if an update on a model should affect the articles including it;
+* Add author's view if needed;
+* Implement delete methods if  needed;
 * Implement logout;
-* Add some details to the group and variable models like descriptions;
-* Update frontend (add introduction page, hide header/footer when not logged in, remove mock authors, real stats like users count);
-* Fix bugs;
-* Add SoapUI tests.
+* Add introduction page;
+* Update front-end behavior when not logged in;
+* Clean code (both back-end front-end);
+* Sync with original Swagger description;
+* Implement SoapUI tests;
+* Make user tests with multiple users.
+
+## BUGS
+
+* Copy a model;
+* When updating an article from the 'recent articles' list, bug with 'publish' state;
+* When updating a model the SVG is not updated (SVG updates when opening article editor);
+* Dynamic stats (users, articles, ...);
+* In the profile view, we shouldn't see the '+' between firstname and lastname;
+* In the profile view links to own articles and so on, are not implemented;
+* Export PDF;
+
+
 
 ### Maintenance
 
diff --git a/src/main/java/org/hbp/mip/controllers/ModelsApi.java b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
index 371173644336544e6dd88ee2b89d0bc709884041..38c6cf100222b100a10700e85d12f0ee9441f124 100644
--- a/src/main/java/org/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
@@ -144,32 +144,6 @@ public class ModelsApi {
         Model model = (Model) query.uniqueResult();
         session.getTransaction().commit();
 
-        // Inject mock data
-        /*List<Object> values = new LinkedList<>();
-        values.add(18422);
-        values.add(16972);
-        values.add(17330);
-        values.add(16398);
-        values.add(21614);
-        values.add(21386);
-        values.add(20474);
-        values.add(19867);
-        values.add(20398);
-        values.add(19741);
-        values.add(18595);
-        values.add(18018);
-        model.getDataset().getData().put("MidTemp", values);
-        model.getDataset().getHeader().add("MidTemp");*/
-
-        /*session = HibernateUtil.getSessionFactory().getCurrentSession();
-        session.beginTransaction();
-        query = session.createQuery("from Dataset where code= :code");
-        query.setString("code", model.getDataset().getCode());
-        Dataset dataset = (Dataset) query.uniqueResult();
-        session.getTransaction().commit();
-
-        System.out.println("keyset : "+dataset.getData().keySet());*/
-
         session = HibernateUtil.getSessionFactory().getCurrentSession();
         session.beginTransaction();
         query = session.createQuery("from Query where id= :id");