Removed handlers as redundant