Tidy up VCS mess