Better handling of removal of teapo's own elements.