Cells cleanup

WIP