EZP-22105: fixed CS
EZP-22105: fixed missing property
EZP-22105: removed dead code