Use CSTD and remove local CSTD settings which are no longer needed.