update for latest sermon and cleanup