removal of local changes to help with MPEG-U, not needed outside