QWS removal, part 2