Cleanup build script - support SCP_TO_TARGET build option consistently.