various cleanups, remove support for CVS checkouts