log4J 2

log4j 2 integration, cleanup