Moved log_subcriber dependency and cleanup