Ok, if I clean up the commits here are you happy to merge this then I will re-introduce the discover client when I implement a feature which needs it?