More cleaning

.