Lots more removal of ignorable stuff