goldcock cleanup

.