New wrappers

Remove everything after "by". The implementation could potentially change, but the result of this cannot.