Remove wip, finally