WIP: fixing remove