cleaned up linking in common-api