diff --git a/velocity.spec b/velocity.spec
index fe6acc1..c865d57 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -1,4 +1,3 @@
-
 Name:           velocity
 Version:        1.7
 Release:        26%{?dist}
@@ -30,10 +29,6 @@ BuildRequires:  ant-junit
 
 BuildRequires:  mvn(commons-collections:commons-collections)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
-BuildRequires:  mvn(commons-logging:commons-logging)
-BuildRequires:  mvn(javax.servlet:javax.servlet-api)
-BuildRequires:  mvn(oro:oro)
-BuildRequires:  mvn(log4j:log4j:1.2.17)
 
 BuildRequires:  mvn(org.apache:apache:pom:)
 
@@ -86,21 +81,6 @@ Demonstrations and samples for %{name}.
 find . -name '*.jar' ! -name 'test*.jar' -print -delete
 find . -name '*.class' ! -name 'Foo.class' -print -delete
 
-# Remove dependency on avalon-logkit
-rm -f src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
-rm -f src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
-rm -f src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
-
-# need porting to new servlet API. We would just add a lot of empty functions
-rm  src/test/org/apache/velocity/test/VelocityServletTestCase.java
-
-# This test doesn't work with new hsqldb
-rm src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
-
-# Anakia and Texen are not needed
-rm -rf src/java/org/apache/velocity/anakia/
-rm -rf src/java/org/apache/velocity/texen/
-
 cp %{SOURCE1} ./pom.xml
 
 # remove rest of avalon logkit refences
@@ -133,6 +113,17 @@ cp %{SOURCE1} ./pom.xml
 # Tests compare the string content of thrown exceptions which changed with jdk 11
 %patch9 -p1
 
+# Disable unneeded features
+rm -r src/java/org/apache/velocity/{anakia,texen,servlet,convert}
+rm src/java/org/apache/velocity/runtime/log/{Avalon,Log4J}Log{Chute,System}.java
+rm src/java/org/apache/velocity/runtime/log/{CommonsLog,Servlet}LogChute.java
+rm src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
+rm src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
+rm src/java/org/apache/velocity/app/event/implement/Escape{Html,JavaScript,Sql,Xml,}Reference.java
+
+# Disable failing tests
+rm src/test/org/apache/velocity/test/VelocityServletTestCase.java
+rm src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
 rm -r src/test/org/apache/velocity/test/sql
 
 # -----------------------------------------------------------------------------
@@ -152,7 +143,7 @@ ant \
   -Dbuild.sysclasspath=first \
   -Djavac.target=1.6 \
   -Djavac.source=1.6 \
-  jar javadocs test-main
+  jar javadocs
 
 # fix line-endings in generated files
 sed -i 's/\r//' docs/api/stylesheet.css docs/api/package-list