Delete files not used in comp.
Catch up changes from latest HG* tag