CS cleanups
Be less chatty in Exception messages
remove some unreachable functions
Some more CS cleanups
More CS fixes (mostly empty if/else/catch statements and unneeded concats)
More CS fixes & cleanups