More cleanup

.