Some changes.
Removed log4j.