remove cell editor, fix few things