Add redis and cleanup