Remove this for cci test