cleanup Choice parameter usage and presence as parameter