Remove more function wrappers