more removal of special cases