Black buttons and DW Notes removal