Jon: Removing Jetty servlets in favour of using Spark