cleanup, modified ignores w/ re: to new strategy