Creampie clean up ...