Cleaned up the dependencies to the batch event framework