Clean up more code to use new redis data