SwappableCell: remove depricated code