Mild cleanup.