Code cleanup
We won't use log4j this time