Refit away from deprecated class