[PATCH] Remove old unused handlers in the current codebase