Removed the individual handlers in addition to other refactoring