remove hardcode of control byte