Removed unused code.
Modified to work with new configuration patterns, added the ability to have non-registered handlers.