- removed unused class
- added Thread pool and some cleanup