some cleanup of other bits