Cleanup to remove outdated and unsupported fn