some cleanup of unused stuff of questionable value