Finished removing Log4j and Slf4j