More cleaning code.