Client clean up and added log4j subscriber