NotFound cleanup