Removed unnecessary <choice> from arrangement