some more general cleanu