Remove GUID, too many bugs, back to standard pop state handling