some cleanup of the old