Progress commit fixing warnings and  doing cleanup