Added Log4J logger, clean up.