Some fixes to prior commit
Remove return key type setting from sample code