Add skip_package_upload variable, remove old/unused files