Remove explicit declaration of ServletContextListener and annotate with @WebListener