Removed legacy code, added proper U-A identification