Removed unused code
Leave device_code in for now - see https://github.com/ebu/cpa-spec/issues/18