Tidy up XD_HOME and fix SimpleModule to not use redis for everything