Cleanup of soft credit API code