Fix solution
Remove now-redundant code
Fix Channel enum references
Code cleanup
Clean up errorCode->Exception handling
Merge branch 'develop'