Removed non-useful wrapper