tidy up, plus no more redis for now