Removed references to user input wrapper.