Remove log4j
Move to seperate method