Cleaned up some old code and comments before attempting to add in Redis