[CLEANUP] KYC: Code cleanup