Remove dead code, fix-up excludes.