diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonPlanService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonPlanService.java
deleted file mode 100644
index 976f583e4..000000000
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonPlanService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * *************************************************************************************************
- *
- *
- * This file is part of WebGoat, an Open Web Application Security Project
- * utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Getting Source ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- *
- */
-
-package org.owasp.webgoat.service;
-
-import org.owasp.webgoat.session.WebSession;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- *
LessonPlanService class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@Controller
-//TODO remove
-public class LessonPlanService {
-
- private final WebSession webSession;
-
- public LessonPlanService(WebSession webSession) {
- this.webSession = webSession;
- }
-
- /**
- * Returns source for current attack
- *
- * @return a {@link java.lang.String} object.
- */
- @RequestMapping(path = "/service/lessonplan.mvc", produces = "application/html")
- public @ResponseBody
- String showPlan() {
- String plan = getPlan();
- return plan;
- }
-
- /**
- * Description of the Method
- *
- * @return Description of the Return Value
- */
- protected String getPlan() {
- return "Plan is not available for this lesson.";
- }
-}
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonProgressService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonProgressService.java
index 17b9ae156..8db037a8f 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonProgressService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonProgressService.java
@@ -31,30 +31,6 @@ public class LessonProgressService {
private UserTrackerRepository userTrackerRepository;
private WebSession webSession;
- /**
- *
LessonProgressService.
- *
- * @return a {@link LessonInfoModel} object.
- */
- @RequestMapping(value = "/service/lessonprogress.mvc", produces = "application/json")
- @ResponseBody
- public Map getLessonInfo() {
- Map json = new HashMap();
- UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
- if (webSession.getCurrentLesson() != null) {
- LessonTracker lessonTracker = userTracker.getLessonTracker(webSession.getCurrentLesson());
- String successMessage = "";
- boolean lessonCompleted = false;
- if (lessonTracker != null) {
- lessonCompleted = isLessonComplete(lessonTracker.getLessonOverview(), webSession.getCurrentLesson());
- successMessage = "LessonCompleted"; //@todo we still use this??
- }
- json.put("lessonCompleted", lessonCompleted);
- json.put("successMessage", successMessage);
- }
- return json;
- }
-
/**
* Endpoint for fetching the complete lesson overview which informs the user about whether all the assignments are solved.
* Used as the last page of the lesson to generate a lesson overview.
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/PluginReloadService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/PluginReloadService.java
deleted file mode 100644
index 917920158..000000000
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/PluginReloadService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * *************************************************************************************************
- *
- *
- * This file is part of WebGoat, an Open Web Application Security Project
- * utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Getting Source ==============
- *
- * Source for this application is maintained at
- * https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.service;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpSession;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *