removed all Text related
wip