Add RedisMonitor support, clean up.