Remove orphaned patch declarations