simplified, remove support of OT