Remove more notice checks as they are unstable