cleanup of a few old bits