Remove remaining declarations found by finddeclarations.pl