Remove dead code

Removed code from old Handler pattern and refactor