Creampie Cleanup

.