Cleaning code #18699