So, I've removed all the clique stuff too, as he said he wasn't going to use it - but now my tests don't pass. Hopefully whatever he is going to build next will fix that.