more cleanup and a short incomplete comparison