Correctly remove existing components to force rebuild, plus changes to script output.