Remove cleanup role
Bump CDH versions