[TASK] KYC: Cleanup