[2.2] Remove unused utility code