fixing remove method