Remove rich support dependency