remove changes, only cruz work keeped