Remove deprecation handling from custom roles