DDF-75: Merged / removed duplicate code and converted handlers to use slf4j.