Build clean up

...while converting CVS to GIT