Fixed cleanup calls which were just plain 'wrong'. You cannot remove
actor from list your iterating over.