@dirs i can't follow this PR, because of this server dir deletion. Can you revert the commit you did about it and keep just the instantclick stuff?