Cleanup build logic in preparation for RemoteTech integration.