VE-1334 fixes from CR to remove method