Remove all other vestiges of kjh's stuff