configuration and doc cleanup