Removing wrapper fns, cleaning up