Revert "Merge branch 'cleanup_wrapper' into 'master'"

After some discussion, we agreed that this was prematurely merged. This reverts merge request !16 (merged)