- Remove the stub "None"/"Remote" adapters; return null for disabled adapters - Add capability checks to adapter enums - Remove the Remote proxy