cleanup wrappers leftovers, fix #2441