Directory cleanup; signature updates