LPS-39798

Now when we have `unregisterServletContext` we don't need these any more :smile: