Back to school clean up

> Ursus Wehrli