Clean up

Removal of redundant code and some old CVS kruft that we don't want.