Try to auto-remove only non-instance things.

Also, try to remove each definition one at a time, eventually.