Remove references to BZGFormFieldCell