[CS] Remove unused code
[CS] Satisfy RSpec deprecation