Creampie cleanup please comment