diff --git a/DEPRECATED.md b/DEPRECATED.md
index bd1f31a389..32abc289e6 100644
--- a/DEPRECATED.md
+++ b/DEPRECATED.md
@@ -46,15 +46,4 @@ ArangoDB and shouldn't be used if possible.
 
 
 ## 2.8
-* Foxx: the method `del` of controllers is deprecated, it will raise a warning if you use it. Please use the `delete` method instead.
-* Foxx: the method `addInjector` of controllers is deprecated, it will raise a warning if you use it. Please use regular variables instead.
-* Foxx: the property `assets` in manifests has been removed entirely. Please use the `files` property and an external build tool instead.
-* Foxx: properties `setup` and `teardown` in manifests have been removed entirely. Please use the `scripts` property instead.
 * Simple queries: the following simple query functions will be removed: collection.near(), collection.within(), collection.geo(), collection.fulltext(), collection.range(), collection.closedRange(). It is recommended to replace calls to these functions with equivalent AQL queries, which are more flexible.
-* The built-in support for CoffeeScript source files is deprecated, it will raise a warning if you use it. Please pre-compile CoffeeScript source files.
-
-
-## 2.9
-* Foxx: the method `del` of controllers has been removed entirely. Please use the `delete` method instead.
-* Foxx: the method `addInjector` of controllers has been removed entirely. Please use regular variables instead.
-* The built-in support for CoffeeScript source files has been removed entirely. Please pre-compile CoffeeScript source files.
diff --git a/js/server/modules/@arangodb/foxx/manager.js b/js/server/modules/@arangodb/foxx/manager.js
index cfb32fb2b7..73289163e6 100644
--- a/js/server/modules/@arangodb/foxx/manager.js
+++ b/js/server/modules/@arangodb/foxx/manager.js
@@ -162,8 +162,8 @@ const manifestSchema = {
     .pattern(RE_NOT_EMPTY, joi.string().required())
     .default(Object, 'empty scripts object')
   ),
-  setup: joi.string().optional(), // TODO remove in 2.8
-  teardown: joi.string().optional(), // TODO remove in 2.8
+  setup: joi.string().optional(),
+  teardown: joi.string().optional(),
   tests: (
     joi.alternatives()
     .try(
@@ -336,7 +336,7 @@ function checkManifest(filename, manifest) {
   }
 
   if (manifest.setup && manifest.setup !== manifest.scripts.setup) {
-    deprecated('2.8', (
+    deprecated('3.0', (
       `Manifest "${filename}" for app "${manifest.name}" contains deprecated attribute "setup",`
       + ` use "scripts.setup" instead.`
     ));
@@ -345,7 +345,7 @@ function checkManifest(filename, manifest) {
   }
 
   if (manifest.teardown && manifest.teardown !== manifest.scripts.teardown) {
-    deprecated('2.8', (
+    deprecated('3.0', (
       `Manifest "${filename}" for app "${manifest.name}" contains deprecated attribute "teardown",`
       + ` use "scripts.teardown" instead.`
     ));
@@ -354,7 +354,7 @@ function checkManifest(filename, manifest) {
   }
 
   if (manifest.assets) {
-    deprecated('2.8', (
+    deprecated('3.0', (
       `Manifest "${filename}" for app "${manifest.name}" contains deprecated attribute "assets",`
       + ` use "files" and an external build tool instead.`
     ));