someone see to the removals above and to this diff