Fix package restore and remove prebuilt XAP