Remove dependency on loggin_handlers