Remove more hardcoding.