extracted part of long method into other method
removed TODO
All logging is now handled by log4j2