Kill off two references to there being a Cancel button

Change-Id: I36f13b2fffcb442c0a4b27d64d388f24c3c3766e