Remove control frame, simplify frame down to one data structure