Now relies on plack, previous stubs and related support files removed