Clean up exclusions and logging