Some more clearing up