Some cleanup
.