Wrapper cleanup
commit after merge