- removed more dead code
- cleanup