Finished removing redis dependency