removed unneeded error collectors
new defect structure