more PhoneGap removal fixes