Improve coverage

- Delete some code
- Remove cheetah ternary expressions