Cleaned up handlers