Proper cell removal almost works. Missing events, still