Cleanup servlets and add isAlive support and websocket deps