Log frame, and more careful about logging in general.  Log4J only in test scope.