Got rid of superfluous 'choice' attribute