fix + start of removal