cream pie cleanup

.