More cleanup in an attempt to get package restore functioning properly