Mild cleanup