Preview: Minor clean up of previous commit