More Notice removal