Edit handlers and remove unnecessary classes.