cleanups
REDIS_DATABASE env support