Cleaned up some CVS relics