Remove dead code
Fix CS