Minor edits to remove Keyboard