Cleanup for duplicate function that has become local to specific extension