Remove some stuff from here that has since been committed to CVS.