Remove worse-than-useless compatibility wrappers