CS fixes - removal of debug settings