Remove unused Handler interface.
Misc. bug fixes and code clean up.