Ignore clover.xml
Misc by hand cleanup