Remove dependency on @WebListener and paxweb snapshot