[Ronald] cleanup