Cleanup and bump redis to 2.8.8