Fourth refactor

Remove exception swallowing try/catch.
Throw CdrException instead of Exception.
Remove unused code.