flipper cleanup; @PEM-- can you double check jade & CS?