remove extra code
random cleanups

- remove 2 tests as there is one already that does everything needed
- fix few warnings