[Wip]remove step