minor cleaning: target->viewIndex
over-engineered groups removed