Reverted REDIS out, cleaned up REDIS in