Remove support for systems without UAA