Remove dependency on LipstickPigServer