refactor, delete old code, use log4j everywhere