Removed redis stuff
Included refactoring of api calls