Cleaned up redundant handlers installation