Remove remaining part ot the WIP anchor type support