merge 'remove delete buttons' task and 'challenge saving behavior enhancement' task.