Reformat and remove consolidate dep

since it's not used.