NotFound clean-out