Added proper removal for Cells