Small changes
BugFix: correct remove object in cell