CDB-2968 Enforced schema on PK removal and removed no longer needed method