Env variable cleanup, hiredis to optional