More coverage exclusions and cleanup.