Log statements cleanup for Slf4J