Post HONEYCOMB-161 cleanup