3.0 - Fix CS

- fix CS error
- remove CS warnings except TODO ones