Scratch stuff removed

Final cleanup to prepare for integration with AutoPkg recipes.