cs fixes
remove combine options