Remove unused choice constants in models