some cleanup on what appmaster handles (journal, events, etc)